emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: random hunt for statics

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libbb/bb_askpass.c
View File

@ -9,7 +9,6 @@
*/ */
#include <termios.h> #include <termios.h>
//#include <sys/ioctl.h>
#include "libbb.h" #include "libbb.h"
@ -20,18 +19,22 @@ static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
char *bb_askpass(int timeout, const char * prompt) char *bb_askpass(int timeout, const char * prompt)
{ {
static char passwd[64]; /* Was static char[BIGNUM] */
enum { sizeof_passwd = 128 };
static char *passwd;
char *ret; char *ret;
int i; int i;
struct sigaction sa; struct sigaction sa;
struct termios old, new; struct termios old, new;
if (!passwd)
passwd = xmalloc(sizeof_passwd);
memset(passwd, 0, sizeof_passwd);
tcgetattr(STDIN_FILENO, &old); tcgetattr(STDIN_FILENO, &old);
tcflush(STDIN_FILENO, TCIFLUSH); tcflush(STDIN_FILENO, TCIFLUSH);
memset(passwd, 0, sizeof(passwd));
fputs(prompt, stdout); fputs(prompt, stdout);
fflush(stdout); fflush(stdout);
@ -48,7 +51,9 @@ char *bb_askpass(int timeout, const char * prompt)
} }
ret = NULL; ret = NULL;
if (read(STDIN_FILENO, passwd, sizeof(passwd)-1) > 0) { /* On timeout, read will hopefully be interrupted by SIGALRM,
* and we return NULL */
if (read(STDIN_FILENO, passwd, sizeof_passwd-1) > 0) {
ret = passwd; ret = passwd;
i = 0; i = 0;
/* Last byte is guaranteed to be 0 /* Last byte is guaranteed to be 0
@ -64,7 +69,7 @@ char *bb_askpass(int timeout, const char * prompt)
} }
tcsetattr(STDIN_FILENO, TCSANOW, &old); tcsetattr(STDIN_FILENO, TCSANOW, &old);
puts(""); putchar('\n');
fflush(stdout); fflush(stdout);
return ret; return ret;
} }

12
libbb/pw_encrypt.c
View File

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