Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/libbb/pw_encrypt.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/libbb/pw_encrypt.c (modified) (4 diffs)

branches/3.3/mindi-busybox/libbb/pw_encrypt.c

@@ -10 +10 @@
 #include "libbb.h"
 
-/* static const uint8_t ascii64[] =
+/* static const uint8_t ascii64[] ALIGN1 =
  * "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
  */
@@ -53 +53 @@
     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++ = '$';
@@ -59 +63 @@
         *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;
         }
@@ -143 +147 @@
 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 : "");
 }