aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-06-12 16:56:52 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-06-12 16:56:52 +0000
commitfdddab0c61c55c25d4218d4370e2b16a7936a794 (patch)
treebf93480018a52ab051189222248b6d04af98d7d4 /loginutils
parent4ea83bf562c44a6792e7c77e7d87cba91f86f763 (diff)
downloadbusybox-w32-fdddab0c61c55c25d4218d4370e2b16a7936a794.tar.gz
busybox-w32-fdddab0c61c55c25d4218d4370e2b16a7936a794.tar.bz2
busybox-w32-fdddab0c61c55c25d4218d4370e2b16a7936a794.zip
make pw_encrypt() return malloc'ed string.
text data bss dec hex filename 759802 604 6684 767090 bb472 busybox_old 759804 604 6676 767084 bb46c busybox_unstripped
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/chpasswd.c1
-rw-r--r--loginutils/passwd.c13
-rw-r--r--loginutils/sulogin.c8
3 files changed, 15 insertions, 7 deletions
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 230ab0fc9..7308596ad 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -65,6 +65,7 @@ int chpasswd_main(int argc ATTRIBUTE_UNUSED, char **argv)
65 bb_info_msg("Password for '%s' changed", name); 65 bb_info_msg("Password for '%s' changed", name);
66 logmode = LOGMODE_STDIO; 66 logmode = LOGMODE_STDIO;
67 free(name); 67 free(name);
68 free(pass);
68 } 69 }
69 70
70 return 0; 71 return 0;
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index fad226c00..0a31137cf 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -16,22 +16,24 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
16 char salt[sizeof("$N$XXXXXXXX")]; /* "$N$XXXXXXXX" or "XX" */ 16 char salt[sizeof("$N$XXXXXXXX")]; /* "$N$XXXXXXXX" or "XX" */
17 char *orig = (char*)""; 17 char *orig = (char*)"";
18 char *newp = NULL; 18 char *newp = NULL;
19 char *cipher = NULL;
20 char *cp = NULL; 19 char *cp = NULL;
21 char *ret = NULL; /* failure so far */ 20 char *ret = NULL; /* failure so far */
22 21
23 if (myuid && pw->pw_passwd[0]) { 22 if (myuid && pw->pw_passwd[0]) {
23 char *encrypted;
24
24 orig = bb_askpass(0, "Old password:"); /* returns ptr to static */ 25 orig = bb_askpass(0, "Old password:"); /* returns ptr to static */
25 if (!orig) 26 if (!orig)
26 goto err_ret; 27 goto err_ret;
27 cipher = pw_encrypt(orig, pw->pw_passwd, 1); /* returns ptr to static */ 28 encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
28 if (strcmp(cipher, pw->pw_passwd) != 0) { 29 if (strcmp(encrypted, pw->pw_passwd) != 0) {
29 syslog(LOG_WARNING, "incorrect password for '%s'", 30 syslog(LOG_WARNING, "incorrect password for '%s'",
30 pw->pw_name); 31 pw->pw_name);
31 bb_do_delay(FAIL_DELAY); 32 bb_do_delay(FAIL_DELAY);
32 puts("Incorrect password"); 33 puts("Incorrect password");
33 goto err_ret; 34 goto err_ret;
34 } 35 }
36 if (ENABLE_FEATURE_CLEAN_UP) free(encrypted);
35 } 37 }
36 orig = xstrdup(orig); /* or else bb_askpass() will destroy it */ 38 orig = xstrdup(orig); /* or else bb_askpass() will destroy it */
37 newp = bb_askpass(0, "New password:"); /* returns ptr to static */ 39 newp = bb_askpass(0, "New password:"); /* returns ptr to static */
@@ -55,8 +57,8 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
55 strcpy(salt, "$1$"); 57 strcpy(salt, "$1$");
56 crypt_make_salt(salt + 3, 4, 0); 58 crypt_make_salt(salt + 3, 4, 0);
57 } 59 }
58 /* pw_encrypt returns ptr to static */ 60 /* pw_encrypt returns malloced str */
59 ret = xstrdup(pw_encrypt(newp, salt, 1)); 61 ret = pw_encrypt(newp, salt, 1);
60 /* whee, success! */ 62 /* whee, success! */
61 63
62 err_ret: 64 err_ret:
@@ -64,7 +66,6 @@ static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
64 if (ENABLE_FEATURE_CLEAN_UP) free(orig); 66 if (ENABLE_FEATURE_CLEAN_UP) free(orig);
65 nuke_str(newp); 67 nuke_str(newp);
66 if (ENABLE_FEATURE_CLEAN_UP) free(newp); 68 if (ENABLE_FEATURE_CLEAN_UP) free(newp);
67 nuke_str(cipher);
68 nuke_str(cp); 69 nuke_str(cp);
69 return ret; 70 return ret;
70} 71}
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index f52ce8a95..38812a6cc 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -72,6 +72,9 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv)
72#endif 72#endif
73 73
74 while (1) { 74 while (1) {
75 char *encrypted;
76 int r;
77
75 /* cp points to a static buffer that is zeroed every time */ 78 /* cp points to a static buffer that is zeroed every time */
76 cp = bb_askpass(timeout, 79 cp = bb_askpass(timeout,
77 "Give root password for system maintenance\n" 80 "Give root password for system maintenance\n"
@@ -81,7 +84,10 @@ int sulogin_main(int argc ATTRIBUTE_UNUSED, char **argv)
81 bb_info_msg("Normal startup"); 84 bb_info_msg("Normal startup");
82 return 0; 85 return 0;
83 } 86 }
84 if (strcmp(pw_encrypt(cp, pwd->pw_passwd, 1), pwd->pw_passwd) == 0) { 87 encrypted = pw_encrypt(cp, pwd->pw_passwd, 1);
88 r = strcmp(encrypted, pwd->pw_passwd);
89 free(encrypted);
90 if (r == 0) {
85 break; 91 break;
86 } 92 }
87 bb_do_delay(FAIL_DELAY); 93 bb_do_delay(FAIL_DELAY);