ash: builtin: Mark more regular built-ins

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

diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index 39ffa084f29a81ce2817e15a9547a0e9d3fb74a8..47c20690fae2b3e3e879a0a5dca5e80c6ae5a2e7 100644 (file)
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -6,10 +6,12 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
+#if !ENABLE_USE_BB_CRYPT
+#include <crypt.h>
+#endif
 #include "libbb.h"
 
-/* static const uint8_t ascii64[] =
+/* static const uint8_t ascii64[] ALIGN1 =
  * "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
  */
 
@@ -30,7 +32,7 @@ static int i64c(int i)
 int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */)
 {
        /* was: x += ... */
-       int x = getpid() + monotonic_us();
+       unsigned x = getpid() + monotonic_us();
        do {
                /* x = (x*1664525 + 1013904223) % 2^32 generator is lame
                 * (low-order bit is not "random", etc...),
@@ -52,14 +54,18 @@ char* FAST_FUNC crypt_make_pw_salt(char salt[MAX_PW_SALT_LEN], const char *algo)
 {
        int len = 2/2;
        char *salt_ptr = salt;
-       if (algo[0] != 'd') { /* not des */
+
+       /* Standard chpasswd uses uppercase algos ("MD5", not "md5").
+        * Need to be case-insensitive in the code below.
+        */
+       if ((algo[0]|0x20) != 'd') { /* not des */
                len = 8/2; /* so far assuming md5 */
                *salt_ptr++ = '$';
                *salt_ptr++ = '1';
                *salt_ptr++ = '$';
 #if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA
-               if (algo[0] == 's') { /* sha */
-                       salt[1] = '5' + (strcmp(algo, "sha512") == 0);
+               if ((algo[0]|0x20) == 's') { /* sha */
+                       salt[1] = '5' + (strcasecmp(algo, "sha512") == 0);
                        len = 16/2;
                }
 #endif
@@ -142,7 +148,14 @@ char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
 
 char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
 {
-       return xstrdup(crypt(clear, salt));
+       char *s;
+
+       s = crypt(clear, salt);
+       /*
+        * glibc used to return "" on malformed salts (for example, ""),
+        * but since 2.17 it returns NULL.
+        */
+       return xstrdup(s ? s : "");
 }
 
 #endif