d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return NULL on error rather than ":", per the crypt(3) man page.

Browse Source 
Discussed in: http://www.openwall.com/lists/oss-security/2011/11/15/3
This commit is contained in:
Kevin Lo 2012-02-22 01:23:14 +00:00
parent 10e777b0f4
commit 19ab58bfe3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
secure/lib/libcrypt/crypt-blowfish.c
View File

@ -72,7 +72,6 @@ static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t);
static void decode_base64(u_int8_t *, u_int16_t, const u_int8_t *);
static char encrypted[_PASSWORD_LEN];
static char error[] = ":";
static const u_int8_t Base64Code[] =
"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
@ -160,8 +159,8 @@ crypt_blowfish(const char *key, const char *salt)
salt++;
if (*salt > BCRYPT_VERSION) {
/* How do I handle errors ? Return ':' */
return error;
/* How do I handle errors ? Return NULL */
return NULL;
}
/* Check for minor versions */
@ -173,7 +172,7 @@ crypt_blowfish(const char *key, const char *salt)
salt++;
break;
default:
return error;
return NULL;
}
} else
minr = 0;
@ -183,13 +182,13 @@ crypt_blowfish(const char *key, const char *salt)
if (salt[2] != '$')
/* Out of sync with passwd entry */
return error;
return NULL;
/* Computer power doesnt increase linear, 2^x should be fine */
logr = (u_int8_t)atoi(salt);
rounds = 1 << logr;
if (rounds < BCRYPT_MINROUNDS)
return error;
return NULL;
/* Discard num rounds + "$" identifier */
salt += 3;