Make SHA512 the default for mkpasswd again, as SHA512 support is guaranteed to *alway...

diff --git a/tools/mkpasswd.c b/tools/mkpasswd.c
index 9d841d149ac75ef6281a46520bc1f21e727d2bf6..d820e0509fc0fb26045b237fc62523b65837b385 100644 (file)
--- 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)