Ignore:
Timestamp:
Jan 1, 2014, 12:47:38 AM (7 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.21.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi-busybox/libbb/pw_encrypt.c

    r2725 r3232  
    2828}
    2929
    30 int FAST_FUNC crypt_make_salt(char *p, int cnt, int x)
     30int FAST_FUNC crypt_make_salt(char *p, int cnt /*, int x */)
    3131{
    32     x += getpid() + time(NULL);
     32    /* was: x += ... */
     33    int x = getpid() + monotonic_us();
    3334    do {
    3435        /* x = (x*1664525 + 1013904223) % 2^32 generator is lame
     
    4647    *p = '\0';
    4748    return x;
     49}
     50
     51char* FAST_FUNC crypt_make_pw_salt(char salt[MAX_PW_SALT_LEN], const char *algo)
     52{
     53    int len = 2/2;
     54    char *salt_ptr = salt;
     55    if (algo[0] != 'd') { /* not des */
     56        len = 8/2; /* so far assuming md5 */
     57        *salt_ptr++ = '$';
     58        *salt_ptr++ = '1';
     59        *salt_ptr++ = '$';
     60#if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA
     61        if (algo[0] == 's') { /* sha */
     62            salt[1] = '5' + (strcmp(algo, "sha512") == 0);
     63            len = 16/2;
     64        }
     65#endif
     66    }
     67    crypt_make_salt(salt_ptr, len);
     68    return salt_ptr;
    4869}
    4970
Note: See TracChangeset for help on using the changeset viewer.