From 0e757317922c88af3bde4d462a2667d499ff12e8 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 29 May 2009 15:10:27 -0700 Subject: [PATCH] Run Nindent on com32/libutil/crypt-md5.c Automatically reformat com32/libutil/crypt-md5.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin --- com32/libutil/crypt-md5.c | 247 +++++++++++++++++++++++----------------------- 1 file changed, 122 insertions(+), 125 deletions(-) diff --git a/com32/libutil/crypt-md5.c b/com32/libutil/crypt-md5.c index 751c3d2..49e9532 100644 --- a/com32/libutil/crypt-md5.c +++ b/com32/libutil/crypt-md5.c @@ -32,132 +32,129 @@ * UNIX password */ -static char * -_crypt_to64(char *s, uint32_t v, int n) +static char *_crypt_to64(char *s, uint32_t v, int n) { - static const char itoa64[64] = "./0123456789" - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - - while (--n >= 0) { - *s++ = itoa64[v&0x3f]; - v >>= 6; - } - return s; + static const char itoa64[64] = "./0123456789" + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + + while (--n >= 0) { + *s++ = itoa64[v & 0x3f]; + v >>= 6; + } + return s; } -char * -crypt_md5(const char *pw, const char *salt) +char *crypt_md5(const char *pw, const char *salt) { - MD5_CTX ctx,ctx1; - unsigned long l; - int sl, pl; - uint32_t i; - uint8_t final[MD5_SIZE]; - const char *sp; - static char passwd[120]; /* Output buffer */ - static const char magic[] = "$1$"; - char *p; - const int magic_len = sizeof magic - 1; - int pwlen = strlen(pw); - - /* Refine the Salt first */ - sp = salt; - - /* If it starts with the magic string, then skip that */ - if (!strncmp(sp, magic, magic_len)) - sp += magic_len; - - /* Compute the salt length: - it stops at the first '$', max 8 chars */ - for (sl = 0; sl < 8 && sp[sl] && sp[sl] != '$'; sl++) - ; - - MD5Init(&ctx); - - /* The password first, since that is what is most unknown */ - MD5Update(&ctx, pw, pwlen); - - /* Then our magic string */ - MD5Update(&ctx, magic, magic_len); - - /* Then the raw salt */ - MD5Update(&ctx, sp, sl); - - /* Then just as many characters of the MD5(pw,salt,pw) */ + MD5_CTX ctx, ctx1; + unsigned long l; + int sl, pl; + uint32_t i; + uint8_t final[MD5_SIZE]; + const char *sp; + static char passwd[120]; /* Output buffer */ + static const char magic[] = "$1$"; + char *p; + const int magic_len = sizeof magic - 1; + int pwlen = strlen(pw); + + /* Refine the Salt first */ + sp = salt; + + /* If it starts with the magic string, then skip that */ + if (!strncmp(sp, magic, magic_len)) + sp += magic_len; + + /* Compute the salt length: + it stops at the first '$', max 8 chars */ + for (sl = 0; sl < 8 && sp[sl] && sp[sl] != '$'; sl++) ; + + MD5Init(&ctx); + + /* The password first, since that is what is most unknown */ + MD5Update(&ctx, pw, pwlen); + + /* Then our magic string */ + MD5Update(&ctx, magic, magic_len); + + /* Then the raw salt */ + MD5Update(&ctx, sp, sl); + + /* Then just as many characters of the MD5(pw,salt,pw) */ + MD5Init(&ctx1); + MD5Update(&ctx1, pw, pwlen); + MD5Update(&ctx1, sp, sl); + MD5Update(&ctx1, pw, pwlen); + MD5Final(final, &ctx1); + for (pl = pwlen; pl > 0; pl -= MD5_SIZE) + MD5Update(&ctx, final, pl > MD5_SIZE ? MD5_SIZE : pl); + + /* Don't leave anything around in vm they could use. */ + memset(final, 0, sizeof final); + + /* Then something really weird... */ + for (i = pwlen; i; i >>= 1) + if (i & 1) + MD5Update(&ctx, final, 1); + else + MD5Update(&ctx, pw, 1); + + /* Now make the output string */ + p = passwd; + + memcpy(p, magic, magic_len); + p += magic_len; + + memcpy(p, sp, sl); + p += sl; + + *p++ = '$'; + + MD5Final(final, &ctx); + + /* + * and now, just to make sure things don't run too fast + * On a 60 Mhz Pentium this takes 34 msec, so you would + * need 30 seconds to build a 1000 entry dictionary... + */ + for (i = 0; i < 1000; i++) { MD5Init(&ctx1); - MD5Update(&ctx1, pw, pwlen); - MD5Update(&ctx1, sp, sl); - MD5Update(&ctx1, pw, pwlen); + if (i & 1) + MD5Update(&ctx1, pw, pwlen); + else + MD5Update(&ctx1, final, MD5_SIZE); + + if (i % 3) + MD5Update(&ctx1, sp, sl); + + if (i % 7) + MD5Update(&ctx1, pw, pwlen); + + if (i & 1) + MD5Update(&ctx1, final, MD5_SIZE); + else + MD5Update(&ctx1, pw, pwlen); MD5Final(final, &ctx1); - for (pl = pwlen; pl > 0; pl -= MD5_SIZE) - MD5Update(&ctx, final, pl > MD5_SIZE ? MD5_SIZE : pl); - - /* Don't leave anything around in vm they could use. */ - memset(final, 0, sizeof final); - - /* Then something really weird... */ - for (i = pwlen; i; i >>= 1) - if (i & 1) - MD5Update(&ctx, final, 1); - else - MD5Update(&ctx, pw, 1); - - /* Now make the output string */ - p = passwd; - - memcpy(p, magic, magic_len); - p += magic_len; - - memcpy(p, sp, sl); - p += sl; - - *p++ = '$'; - - MD5Final(final, &ctx); - - /* - * and now, just to make sure things don't run too fast - * On a 60 Mhz Pentium this takes 34 msec, so you would - * need 30 seconds to build a 1000 entry dictionary... - */ - for (i = 0; i < 1000; i++) { - MD5Init(&ctx1); - if(i & 1) - MD5Update(&ctx1, pw, pwlen); - else - MD5Update(&ctx1, final, MD5_SIZE); - - if(i % 3) - MD5Update(&ctx1, sp, sl); - - if(i % 7) - MD5Update(&ctx1, pw, pwlen); - - if(i & 1) - MD5Update(&ctx1, final, MD5_SIZE); - else - MD5Update(&ctx1, pw, pwlen); - MD5Final(final, &ctx1); - } - - l = (final[ 0]<<16) | (final[ 6]<<8) | final[12]; - p = _crypt_to64(p, l, 4); - l = (final[ 1]<<16) | (final[ 7]<<8) | final[13]; - p = _crypt_to64(p, l, 4); - l = (final[ 2]<<16) | (final[ 8]<<8) | final[14]; - p = _crypt_to64(p, l, 4); - l = (final[ 3]<<16) | (final[ 9]<<8) | final[15]; - p = _crypt_to64(p, l, 4); - l = (final[ 4]<<16) | (final[10]<<8) | final[ 5]; - p = _crypt_to64(p, l, 4); - l = final[11]; - p = _crypt_to64(p, l, 2); - *p = '\0'; - - /* Don't leave anything around in vm they could use. */ - memset(final, 0, sizeof final); - - return passwd; + } + + l = (final[0] << 16) | (final[6] << 8) | final[12]; + p = _crypt_to64(p, l, 4); + l = (final[1] << 16) | (final[7] << 8) | final[13]; + p = _crypt_to64(p, l, 4); + l = (final[2] << 16) | (final[8] << 8) | final[14]; + p = _crypt_to64(p, l, 4); + l = (final[3] << 16) | (final[9] << 8) | final[15]; + p = _crypt_to64(p, l, 4); + l = (final[4] << 16) | (final[10] << 8) | final[5]; + p = _crypt_to64(p, l, 4); + l = final[11]; + p = _crypt_to64(p, l, 2); + *p = '\0'; + + /* Don't leave anything around in vm they could use. */ + memset(final, 0, sizeof final); + + return passwd; } #ifdef TEST @@ -165,12 +162,12 @@ crypt_md5(const char *pw, const char *salt) int main(int argc, char *argv[]) { - int i; + int i; - for (i = 2; i < argc; i += 2) { - puts(crypt_md5(argv[i], argv[i-1])); - } - return 0; + for (i = 2; i < argc; i += 2) { + puts(crypt_md5(argv[i], argv[i - 1])); + } + return 0; } #endif -- 2.7.4