summaryrefslogtreecommitdiffstats
path: root/secure/lib
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2012-05-30 12:01:28 +0000
committerbz <bz@FreeBSD.org>2012-05-30 12:01:28 +0000
commitd2e144fbe85bda158b8f8dc37eefdec358d88107 (patch)
tree65737bc2effe2c9fe69b85d98c9b789db453e3d5 /secure/lib
parentabc1dafefabb78b40381e8df4b7dc98089ce60e0 (diff)
downloadFreeBSD-src-d2e144fbe85bda158b8f8dc37eefdec358d88107.zip
FreeBSD-src-d2e144fbe85bda158b8f8dc37eefdec358d88107.tar.gz
Update the previous openssl fix. [12:01]
Fix a bug in crypt(3) ignoring characters of a passphrase. [12:02] Security: FreeBSD-SA-12:01.openssl (revised) Security: FreeBSD-SA-12:02.crypt Approved by: so (bz, simon)
Diffstat (limited to 'secure/lib')
-rw-r--r--secure/lib/libcrypt/crypt-des.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index 9adff93..6bb9bc0 100644
--- a/secure/lib/libcrypt/crypt-des.c
+++ b/secure/lib/libcrypt/crypt-des.c
@@ -606,7 +606,7 @@ crypt_des(const char *key, const char *setting)
q = (u_char *)keybuf;
while (q - (u_char *)keybuf - 8) {
*q++ = *key << 1;
- if (*(q - 1))
+ if (*key != '\0')
key++;
}
if (des_setkey((char *)keybuf))
OpenPOWER on IntegriCloud