libbb: random hunt for statics

function                                             old     new   delta
bb_askpass                                           306     321     +15
pw_encrypt                                            38      39      +1
static.passwd                                         64       4     -60
static.cipher                                        128       4    -124
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 16/-184)          Total: -168 bytes

# size busybox_old busybox_unstripped
   text    data     bss     dec     hex filename
 683705    2704   14240  700649   ab0e9 busybox_old
 683721    2704   14064  700489   ab049 busybox_unstripped
This commit is contained in:
Denis Vlasenko
2007-06-18 10:35:06 +00:00
parent 2c91efb7c2
commit 91e149a373
2 changed files with 16 additions and 13 deletions

View File

@@ -12,18 +12,16 @@
char *pw_encrypt(const char *clear, const char *salt)
{
static char cipher[128];
char *cp;
/* Was static char[BIGNUM]. Malloced thing works as well */
static char *cipher;
#if 0 /* was CONFIG_FEATURE_SHA1_PASSWORDS, but there is no such thing??? */
if (strncmp(salt, "$2$", 3) == 0) {
return sha1_crypt(clear);
}
#endif
cp = (char *) crypt(clear, salt);
/* if crypt (a nonstandard crypt) returns a string too large,
truncate it so we don't overrun buffers and hope there is
enough security in what's left */
safe_strncpy(cipher, cp, sizeof(cipher));
free(cipher);
cipher = xstrdup(crypt(clear, salt));
return cipher;
}