diff options
| author | Steve Langasek <vorlon@debian.org> | 2001-07-10 20:24:16 +0000 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2001-07-10 20:24:16 +0000 |
| commit | 1c3bff246cd5c22565ba6fbec1658852c9f99224 (patch) | |
| tree | 64d882a1c56887e470b6d55fe7d6dd5fdf9228e2 /modules/pam_unix/md5_crypt.c | |
| parent | e5d527e8dfba82f1c47f6b1d3751cf2f17cf2cab (diff) | |
| download | pam-1c3bff246cd5c22565ba6fbec1658852c9f99224.tar.gz pam-1c3bff246cd5c22565ba6fbec1658852c9f99224.tar.bz2 pam-1c3bff246cd5c22565ba6fbec1658852c9f99224.zip | |
Relevant BUGIDs: 440107
Purpose of commit: bugfix/cleanup
Commit summary:
---------------
Removed superfluous use of static variables in md5 and bigcrypt routines,
bringing us a step closer to thread-safeness. Eliminated some variable
indirection along the way.
Diffstat (limited to 'modules/pam_unix/md5_crypt.c')
| -rw-r--r-- | modules/pam_unix/md5_crypt.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/pam_unix/md5_crypt.c b/modules/pam_unix/md5_crypt.c index a7243a2e..53972fcc 100644 --- a/modules/pam_unix/md5_crypt.c +++ b/modules/pam_unix/md5_crypt.c @@ -13,6 +13,7 @@ */ #include <string.h> +#include <stdlib.h> #include "md5.h" static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ @@ -37,8 +38,8 @@ char *MD5Name(crypt_md5)(const char *pw, const char *salt) const char *magic = "$1$"; /* This string is magic for this algorithm. Having * it this way, we can get get better later on */ - static char passwd[120], *p; - static const char *sp, *ep; + char *passwd, *p; + const char *sp, *ep; unsigned char final[16]; int sl, pl, i, j; MD5_CTX ctx, ctx1; @@ -47,6 +48,10 @@ char *MD5Name(crypt_md5)(const char *pw, const char *salt) /* Refine the Salt first */ sp = salt; + /* TODO: now that we're using malloc'ed memory, get rid of the + strange constant buffer size. */ + passwd = malloc(120); + /* If it starts with the magic string, then skip that */ if (!strncmp(sp, magic, strlen(magic))) sp += strlen(magic); |