Module Name: src
Committed By: christos
Date: Tue Dec 27 01:20:45 UTC 2011
Modified Files:
src/lib/libcrypt: crypt.c
Log Message:
perform the check for all salts > 2.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libcrypt/crypt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcrypt/crypt.c
diff -u src/lib/libcrypt/crypt.c:1.30 src/lib/libcrypt/crypt.c:1.31
--- src/lib/libcrypt/crypt.c:1.30 Mon Dec 26 17:58:45 2011
+++ src/lib/libcrypt/crypt.c Mon Dec 26 20:20:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crypt.c,v 1.30 2011/12/26 22:58:45 christos Exp $ */
+/* $NetBSD: crypt.c,v 1.31 2011/12/27 01:20:45 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)crypt.c 8.1.1.1 (Berkeley) 8/18/93";
#else
-__RCSID("$NetBSD: crypt.c,v 1.30 2011/12/26 22:58:45 christos Exp $");
+__RCSID("$NetBSD: crypt.c,v 1.31 2011/12/27 01:20:45 christos Exp $");
#endif
#endif /* not lint */
@@ -578,7 +578,7 @@ crypt(const char *key, const char *setti
salt = 0;
for (i = salt_size; --i >= 0; ) {
int value = ascii_to_bin(setting[i]);
- if (salt_size == 4 && itoa64[value] != setting[i])
+ if (salt_size > 2 && itoa64[value] != setting[i])
return NULL;
encp[i] = setting[i];
salt = (salt << 6) | value;
