emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/salt.c (MAGNUM): Terminate the array with nul (the array

Browse Source 
is then used with strcat).
* libmisc/salt.c (crypt_make_salt): Initialize result[0] to nul at
  the beginning (was not initialized when USE_PAM).
* libmisc/salt.c (crypt_make_salt): Check that ENCRYPT_METHOD is a
  valid crypt method.
This commit is contained in:
nekral-guest 2007-11-19 22:34:48 +00:00
parent 65f536165d
commit c214b26ee6
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-11-19 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/salt.c (MAGNUM): Terminate the array with nul (the array
is then used with strcat).
* libmisc/salt.c (crypt_make_salt): Initialize result[0] to nul at
the beginning (was not initialized when USE_PAM).
* libmisc/salt.c (crypt_make_salt): Check that ENCRYPT_METHOD is a
valid crypt method.
2007-11-19 Nicolas François <nicolas.francois@centraliens.net> 2007-11-19 Nicolas François <nicolas.francois@centraliens.net>
* NEWS, libmisc/obscure.c, libmisc/salt.c, src/passwd.c, * NEWS, libmisc/obscure.c, libmisc/salt.c, src/passwd.c,

18
libmisc/salt.c
View File

@ -59,7 +59,9 @@ char *l64a(long value)
* version of crypt() instead of the standard one. * version of crypt() instead of the standard one.
*/ */
#define MAGNUM(array,ch) (array)[0]= (array)[2] = '$',(array)[1]=(ch) #define MAGNUM(array,ch) (array)[0]= (array)[2] = '$',\
(array)[1]=(ch),\
(array)[2]='\0'
char *crypt_make_salt (void) char *crypt_make_salt (void)
{ {
@ -68,6 +70,8 @@ char *crypt_make_salt (void)
int max_salt_len = 8; int max_salt_len = 8;
char *method; char *method;
result[0] = '\0';
#ifndef USE_PAM #ifndef USE_PAM
#ifdef ENCRYPTMETHOD_SELECT #ifdef ENCRYPTMETHOD_SELECT
if ((method = getdef_str ("ENCRYPT_METHOD")) == NULL) { if ((method = getdef_str ("ENCRYPT_METHOD")) == NULL) {
@ -75,8 +79,7 @@ char *crypt_make_salt (void)
if (getdef_bool ("MD5_CRYPT_ENAB")) { if (getdef_bool ("MD5_CRYPT_ENAB")) {
MAGNUM(result,'1'); MAGNUM(result,'1');
max_salt_len = 11; max_salt_len = 11;
} else }
result[0] = '\0';
#ifdef ENCRYPTMETHOD_SELECT #ifdef ENCRYPTMETHOD_SELECT
} else { } else {
if (!strncmp (method, "MD5", 3)) { if (!strncmp (method, "MD5", 3)) {
@ -88,11 +91,14 @@ char *crypt_make_salt (void)
} else if (!strncmp (method, "SHA512", 6)) { } else if (!strncmp (method, "SHA512", 6)) {
MAGNUM(result, '6'); MAGNUM(result, '6');
max_salt_len = 11; /* XXX: should not be fixed */ max_salt_len = 11; /* XXX: should not be fixed */
} else if (!strncmp (method, "DES", 3)) } else if (0 != strncmp (method, "DES", 3)) {
result[0] = '\0'; fprintf (stderr,
else _("Invalid ENCRYPT_METHOD value: '%s'.\n"
"Defaulting to DES.\n"),
method);
result[0] = '\0'; result[0] = '\0';
} }
}
#endif /* ENCRYPTMETHOD_SELECT */ #endif /* ENCRYPTMETHOD_SELECT */
#endif /* USE_PAM */ #endif /* USE_PAM */
/* /*