mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

cracklib:Fix an error in the patch

Browse Source 
To fix an error in the patch.Otherwise,the dictionary would be wrong.

(From OE-Core rev: 8670b99b06ce14ed391b4713d7887af90d44a2c8)

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Lei Maohui
2015-06-09 10:27:55 +08:00
committed by Richard Purdie
parent 8db97b5991
commit f08baeed2c
1 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
+37 -30
View File
@@ -1,7 +1,7 @@
From dae29a98c066bc67bb5ba12219d5fd68a8675514 Mon Sep 17 00:00:00 2001 From 8a6e43726ad0ae41bd1cc2c248d91deb31459357 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com> From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Fri, 26 Apr 2013 20:44:10 +0800 Date: Tue, 9 Jun 2015 11:11:48 +0900
Subject: [PATCH] packlib.c: support dictionary byte-order dependent Subject: [PATCH] packlib.c: support dictionary byte order dependent
The previous dict files are NOT byte-order independent, in fact they are The previous dict files are NOT byte-order independent, in fact they are
probably ARCHITECTURE SPECIFIC. probably ARCHITECTURE SPECIFIC.
@@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Pending Upstream-Status: Pending
We can't use the endian.h, htobe* and be*toh functions because they are We can't use the endian.h, htobe* and be*toh functions because they are
not available on older versions of glibc, such as that found in RHEL not available on older versions of glibc, such as that found in RHEL
5.9. 5.9.
Change to checking endian and directly calling bswap_* as defined in Change to checking endian and directly calling bswap_* as defined in
@@ -20,14 +20,15 @@ byteswap.h.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
--- ---
lib/packlib.c | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- lib/packlib.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 204 insertions(+), 4 deletions(-) 1 file changed, 210 insertions(+), 4 deletions(-)
Index: cracklib-2.8.22/lib/packlib.c diff --git a/lib/packlib.c b/lib/packlib.c
=================================================================== index f851424..3aac805 100644
--- cracklib-2.8.22.orig/lib/packlib.c --- a/lib/packlib.c
+++ cracklib-2.8.22/lib/packlib.c +++ b/lib/packlib.c
@@ -16,6 +16,12 @@ @@ -16,6 +16,12 @@
#ifdef HAVE_STDINT_H #ifdef HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>
@@ -41,7 +42,7 @@ Index: cracklib-2.8.22/lib/packlib.c
#include "packer.h" #include "packer.h"
static const char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993"; static const char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993";
@@ -45,6 +51,182 @@ typedef struct @@ -45,6 +51,185 @@ typedef struct
char data_get[NUMWORDS][MAXWORDLEN]; char data_get[NUMWORDS][MAXWORDLEN];
} PWDICT64; } PWDICT64;
@@ -145,7 +146,8 @@ Index: cracklib-2.8.22/lib/packlib.c
+ +
+ for (i = 0; i < nLen / sizeof(uint64_t); i++) + for (i = 0; i < nLen / sizeof(uint64_t); i++)
+ { + {
+ *pHwms64++ = bswap_64(*pHwms64); + *pHwms64 = bswap_64(*pHwms64);
+ *pHwms64++;
+ } + }
+ +
+ } + }
@@ -155,7 +157,8 @@ Index: cracklib-2.8.22/lib/packlib.c
+ +
+ for (i = 0; i < nLen / sizeof(uint32_t); i++) + for (i = 0; i < nLen / sizeof(uint32_t); i++)
+ { + {
+ *pHwms32++ = bswap_32(*pHwms32); + *pHwms32 = bswap_32(*pHwms32);
+ *pHwms32++;
+ } + }
+ +
+ } + }
@@ -199,7 +202,8 @@ Index: cracklib-2.8.22/lib/packlib.c
+ +
+ for (i = 0; i < nLen / sizeof(uint32_t); i++) + for (i = 0; i < nLen / sizeof(uint32_t); i++)
+ { + {
+ *pHwms32++ = bswap_32(*pHwms32); + *pHwms32 = bswap_32(*pHwms32);
+ *pHwms32++;
+ } + }
+ +
+ } + }
@@ -224,7 +228,7 @@ Index: cracklib-2.8.22/lib/packlib.c
static int static int
_PWIsBroken64(FILE *ifp) _PWIsBroken64(FILE *ifp)
@@ -57,6 +239,7 @@ _PWIsBroken64(FILE *ifp) @@ -57,6 +242,7 @@ _PWIsBroken64(FILE *ifp)
return 0; return 0;
} }
@@ -232,7 +236,7 @@ Index: cracklib-2.8.22/lib/packlib.c
return (pdesc64.header.pih_magic == PIH_MAGIC); return (pdesc64.header.pih_magic == PIH_MAGIC);
} }
@@ -149,7 +332,11 @@ PWOpen(prefix, mode) @@ -149,7 +335,11 @@ PWOpen(prefix, mode)
pdesc.header.pih_blocklen = NUMWORDS; pdesc.header.pih_blocklen = NUMWORDS;
pdesc.header.pih_numwords = 0; pdesc.header.pih_numwords = 0;
@@ -245,23 +249,23 @@ Index: cracklib-2.8.22/lib/packlib.c
} else } else
{ {
pdesc.flags &= ~PFOR_WRITE; pdesc.flags &= ~PFOR_WRITE;
@@ -173,6 +360,7 @@ PWOpen(prefix, mode) @@ -173,6 +363,7 @@ PWOpen(prefix, mode)
return ((PWDICT *) 0); return NULL;
} }
+ IheaderBigEndianToHost((char *) &pdesc.header, en_is32); + IheaderBigEndianToHost((char *) &pdesc.header, en_is32);
if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0)) if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0))
{ {
/* uh-oh. either a broken "64-bit" file or a garbage file. */ /* uh-oh. either a broken "64-bit" file or a garbage file. */
@@ -195,6 +383,7 @@ PWOpen(prefix, mode) @@ -195,6 +386,7 @@ PWOpen(prefix, mode)
} }
return ((PWDICT *) 0); return NULL;
} }
+ IheaderBigEndianToHost((char *) &pdesc64.header, en_is64); + IheaderBigEndianToHost((char *) &pdesc64.header, en_is64);
if (pdesc64.header.pih_magic != PIH_MAGIC) if (pdesc64.header.pih_magic != PIH_MAGIC)
{ {
/* nope, not "64-bit" after all */ /* nope, not "64-bit" after all */
@@ -290,6 +479,7 @@ PWOpen(prefix, mode) @@ -290,6 +482,7 @@ PWOpen(prefix, mode)
{ {
pdesc.flags &= ~PFOR_USEHWMS; pdesc.flags &= ~PFOR_USEHWMS;
} }
@@ -269,7 +273,7 @@ Index: cracklib-2.8.22/lib/packlib.c
for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++) for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++)
{ {
pdesc.hwms[i] = pdesc64.hwms[i]; pdesc.hwms[i] = pdesc64.hwms[i];
@@ -299,6 +489,7 @@ PWOpen(prefix, mode) @@ -299,6 +492,7 @@ PWOpen(prefix, mode)
{ {
pdesc.flags &= ~PFOR_USEHWMS; pdesc.flags &= ~PFOR_USEHWMS;
} }
@@ -277,7 +281,7 @@ Index: cracklib-2.8.22/lib/packlib.c
#if DEBUG #if DEBUG
for (i=1; i<=0xff; i++) for (i=1; i<=0xff; i++)
{ {
@@ -332,7 +523,11 @@ PWClose(pwp) @@ -332,7 +526,11 @@ PWClose(pwp)
return (-1); return (-1);
} }
@@ -290,7 +294,7 @@ Index: cracklib-2.8.22/lib/packlib.c
{ {
fprintf(stderr, "index magic fwrite failed\n"); fprintf(stderr, "index magic fwrite failed\n");
return (-1); return (-1);
@@ -351,7 +546,12 @@ PWClose(pwp) @@ -351,7 +549,12 @@ PWClose(pwp)
printf("hwm[%02x] = %d\n", i, pwp->hwms[i]); printf("hwm[%02x] = %d\n", i, pwp->hwms[i]);
#endif #endif
} }
@@ -304,7 +308,7 @@ Index: cracklib-2.8.22/lib/packlib.c
} }
} }
@@ -405,7 +605,8 @@ PutPW(pwp, string) @@ -405,7 +608,8 @@ PutPW(pwp, string)
datum = (uint32_t) ftell(pwp->dfp); datum = (uint32_t) ftell(pwp->dfp);
@@ -314,19 +318,22 @@ Index: cracklib-2.8.22/lib/packlib.c
fputs(pwp->data_put[0], pwp->dfp); fputs(pwp->data_put[0], pwp->dfp);
putc(0, pwp->dfp); putc(0, pwp->dfp);
@@ -473,6 +674,7 @@ GetPW(pwp, number) @@ -464,6 +668,7 @@ GetPW(pwp, number)
perror("(index fread failed)"); perror("(index fread failed)");
return ((char *) 0); return NULL;
} }
+ datum64 = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_64(datum64) : datum64; + datum64 = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_64(datum64) : datum64;
datum = datum64; datum = datum64;
} else { } else {
if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0)) if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0))
@@ -486,6 +688,7 @@ GetPW(pwp, number) @@ -477,6 +682,7 @@ GetPW(pwp, number)
perror("(index fread failed)"); perror("(index fread failed)");
return ((char *) 0); return NULL;
} }
+ datum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum; + datum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum;
} }
int r = 1; int r = 1;
--
1.8.4.2