svn commit: trunk/busybox/libbb
vda at busybox.net
vda at busybox.net
Fri Jun 13 15:13:42 UTC 2008
Author: vda
Date: 2008-06-13 08:13:41 -0700 (Fri, 13 Jun 2008)
New Revision: 22327
Log:
trivial crypt shrinkage
function old new delta
__md5_to64 27 29 +2
pw_encrypt 3631 3608 -23
Modified:
trunk/busybox/libbb/pw_encrypt_des.c
trunk/busybox/libbb/pw_encrypt_md5.c
Changeset:
Modified: trunk/busybox/libbb/pw_encrypt_des.c
===================================================================
--- trunk/busybox/libbb/pw_encrypt_des.c 2008-06-13 14:28:57 UTC (rev 22326)
+++ trunk/busybox/libbb/pw_encrypt_des.c 2008-06-13 15:13:41 UTC (rev 22327)
@@ -673,8 +673,6 @@
return output;
}
-// des_setkey never fails
-
#undef C
#undef init_perm
#undef final_perm
Modified: trunk/busybox/libbb/pw_encrypt_md5.c
===================================================================
--- trunk/busybox/libbb/pw_encrypt_md5.c 2008-06-13 14:28:57 UTC (rev 22326)
+++ trunk/busybox/libbb/pw_encrypt_md5.c 2008-06-13 15:13:41 UTC (rev 22327)
@@ -501,13 +501,14 @@
}
-static void
-__md5_to64(char *s, unsigned long v, int n)
+static char*
+__md5_to64(char *s, unsigned v, int n)
{
while (--n >= 0) {
*s++ = ascii64[v & 0x3f];
v >>= 6;
}
+ return s;
}
/*
@@ -515,7 +516,7 @@
*
* Use MD5 for what it is best at...
*/
-#define MD5_OUT_BUFSIZE 120
+#define MD5_OUT_BUFSIZE 36
static char *
md5_crypt(char passwd[120], const unsigned char *pw, const unsigned char *salt)
@@ -578,7 +579,6 @@
passwd[2] = '$';
strncpy(passwd + 3, (char*)sp, sl);
passwd[sl + 3] = '$';
- passwd[sl + 4] = '\0';
__md5_Final(final, &ctx);
@@ -607,15 +607,16 @@
__md5_Final(final, &ctx1);
}
- p = passwd + sl + 4; /*strlen(passwd);*/
+ p = passwd + sl + 4; /* 12 bytes max (sl is up to 8 bytes) */
+ /* Add 5*4+2 = 22 bytes of hash, + NUL byte. */
final[16] = final[5];
for (i = 0; i < 5; i++) {
l = (final[i] << 16) | (final[i+6] << 8) | final[i+12];
- __md5_to64(p, l, 4); p += 4;
+ p = __md5_to64(p, l, 4);
}
l = final[11];
- __md5_to64(p, l, 2); p += 2;
+ p = __md5_to64(p, l, 2);
*p = '\0';
/* Don't leave anything around in vm they could use. */
More information about the busybox-cvs
mailing list