| passwd.c (68651) | passwd.c (72613) |
|---|---|
| 1/* apps/passwd.c */ 2 3#if defined NO_MD5 || defined CHARSET_EBCDIC 4# define NO_MD5CRYPT_1 5#endif 6 7#if !defined(NO_DES) || !defined(NO_MD5CRYPT_1) 8 --- 301 unchanged lines hidden (view full) --- 310 passwd_len = strlen(passwd); 311 out_buf[0] = '$'; 312 out_buf[1] = 0; 313 assert(strlen(magic) <= 4); /* "1" or "apr1" */ 314 strncat(out_buf, magic, 4); 315 strncat(out_buf, "$", 1); 316 strncat(out_buf, salt, 8); 317 assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */ | 1/* apps/passwd.c */ 2 3#if defined NO_MD5 || defined CHARSET_EBCDIC 4# define NO_MD5CRYPT_1 5#endif 6 7#if !defined(NO_DES) || !defined(NO_MD5CRYPT_1) 8 --- 301 unchanged lines hidden (view full) --- 310 passwd_len = strlen(passwd); 311 out_buf[0] = '$'; 312 out_buf[1] = 0; 313 assert(strlen(magic) <= 4); /* "1" or "apr1" */ 314 strncat(out_buf, magic, 4); 315 strncat(out_buf, "$", 1); 316 strncat(out_buf, salt, 8); 317 assert(strlen(out_buf) <= 6 + 8); /* "$apr1$..salt.." */ |
| 318 salt_out = out_buf + 6; | 318 salt_out = out_buf + 2 + strlen(magic); |
| 319 salt_len = strlen(salt_out); 320 assert(salt_len <= 8); 321 322 MD5_Init(&md); 323 MD5_Update(&md, passwd, passwd_len); 324 MD5_Update(&md, "$", 1); 325 MD5_Update(&md, magic, strlen(magic)); 326 MD5_Update(&md, "$", 1); --- 176 unchanged lines hidden --- | 319 salt_len = strlen(salt_out); 320 assert(salt_len <= 8); 321 322 MD5_Init(&md); 323 MD5_Update(&md, passwd, passwd_len); 324 MD5_Update(&md, "$", 1); 325 MD5_Update(&md, magic, strlen(magic)); 326 MD5_Update(&md, "$", 1); --- 176 unchanged lines hidden --- |