From 7600b65f4d7e5c840c508ae20f42ea7a92cf5e01 Mon Sep 17 00:00:00 2001 From: Elizabeth Jennifer Myers Date: Thu, 6 Jan 2011 01:56:47 -0500 Subject: [PATCH] Make SHA512 the default for mkpasswd again, as SHA512 support is guaranteed to *always* be in libratbox. --- tools/mkpasswd.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/mkpasswd.c b/tools/mkpasswd.c index 9d841d14..d820e050 100644 --- a/tools/mkpasswd.c +++ b/tools/mkpasswd.c @@ -163,7 +163,16 @@ main(int argc, char *argv[]) } } - if(flag & FLAG_BLOWFISH) + if(flag & FLAG_MD5) + { + if(length == 0) + length = 8; + if(flag & FLAG_SALT) + salt = make_md5_salt_para(saltpara); + else + salt = make_md5_salt(length); + } + else if(flag & FLAG_BLOWFISH) { if(length == 0) length = 22; @@ -181,15 +190,6 @@ main(int argc, char *argv[]) else salt = make_sha256_salt(length); } - else if(flag & FLAG_SHA512) - { - if(length == 0) - length = 16; - if(flag & FLAG_SALT) - salt = make_sha512_salt_para(saltpara); - else - salt = make_sha512_salt(length); - } else if(flag & FLAG_EXT) { /* XXX - rounds needs to be done */ @@ -232,11 +232,11 @@ main(int argc, char *argv[]) else { if(length == 0) - length = 8; + length = 16; if(flag & FLAG_SALT) - salt = make_md5_salt_para(saltpara); + salt = make_sha512_salt_para(saltpara); else - salt = make_md5_salt(length); + salt = make_sha512_salt(length); } if(flag & FLAG_PASS)