Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/libbb/pw_encrypt.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/libbb/pw_encrypt.c (modified) (2 diffs)

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

@@ -28 +28 @@
 }
 
-int FAST_FUNC crypt_make_salt(char *p, int cnt, int x)
+int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */)
 {
-    x += getpid() + time(NULL);
+    /* was: x += ... */
+    int x = getpid() + monotonic_us();
     do {
         /* x = (x*1664525 + 1013904223) % 2^32 generator is lame
@@ -46 +47 @@
     *p = '\0';
     return x;
+}
+
+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 */
+        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);
+            len = 16/2;
+        }
+#endif
+    }
+    crypt_make_salt(salt_ptr, len);
+    return salt_ptr;
 }