libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / libbb / correct_password.c

diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 96bb10e0b465f83be79eb1e1a22a557771a898c4..acadf391434c4b06b52e32f24057e50bba2512e4 100644 (file)
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -31,21 +31,19 @@
 #include "libbb.h"
 
 /* Ask the user for a password.
+ * Return 1 without asking if PW has an empty password.
+ * Return -1 on EOF, error while reading input, or timeout.
  * Return 1 if the user gives the correct password for entry PW,
- * 0 if not.  Return 1 without asking if PW has an empty password.
+ * 0 if not.
  *
- * NULL pw means "just fake it for login with bad username" */
-
-int correct_password(const struct passwd *pw)
+ * NULL pw means "just fake it for login with bad username"
+ */
+int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
+               int timeout, const char *prompt)
 {
        char *unencrypted, *encrypted;
        const char *correct;
-#if ENABLE_FEATURE_SHADOWPASSWDS
-       /* Using _r function to avoid pulling in static buffers */
-       struct spwd spw;
-       char buffer[256];
-#endif
-
+       int r;
        /* fake salt. crypt() can choke otherwise. */
        correct = "aa";
        if (!pw) {
@@ -54,11 +52,14 @@ int correct_password(const struct passwd *pw)
        }
        correct = pw->pw_passwd;
 #if ENABLE_FEATURE_SHADOWPASSWDS
+       /* Using _r function to avoid pulling in static buffers */
        if ((correct[0] == 'x' || correct[0] == '*') && !correct[1]) {
+               struct spwd spw;
+               char buffer[256];
                /* getspnam_r may return 0 yet set result to NULL.
                 * At least glibc 2.4 does this. Be extra paranoid here. */
                struct spwd *result = NULL;
-               int r = getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result);
+               r = getspnam_r(pw->pw_name, &spw, buffer, sizeof(buffer), &result);
                correct = (r || !result) ? "aa" : result->sp_pwdp;
        }
 #endif
@@ -67,11 +68,19 @@ int correct_password(const struct passwd *pw)
                return 1;
 
  fake_it:
-       unencrypted = bb_askpass(0, "Password: ");
+       unencrypted = bb_ask(STDIN_FILENO, timeout, prompt);
        if (!unencrypted) {
-               return 0;
+               /* EOF (such as ^D) or error (such as ^C) or timeout */
+               return -1;
        }
-       encrypted = crypt(unencrypted, correct);
-       memset(unencrypted, 0, strlen(unencrypted));
-       return strcmp(encrypted, correct) == 0;
+       encrypted = pw_encrypt(unencrypted, correct, 1);
+       r = (strcmp(encrypted, correct) == 0);
+       free(encrypted);
+       nuke_str(unencrypted);
+       return r;
+}
+
+int FAST_FUNC ask_and_check_password(const struct passwd *pw)
+{
+       return ask_and_check_password_extended(pw, 0, "Password: ");
 }