commio: Properly zero a struct msghdr.

[solanum.git] / tools / mkpasswd.c

diff --git a/tools/mkpasswd.c b/tools/mkpasswd.c
index 2ab5dbd34ca9e3a199f3573e260fa256797517e2..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)
@@ -440,7 +440,7 @@ make_bf_salt(int rounds, int length)
        char tbuf[3];
        if(length > 22)
        {
-               printf("BlowFish salt length too long\n");
+               printf("Blowfish salt length too long\n");
                exit(0);
        }
        sprintf(tbuf, "%02d", rounds);
@@ -495,14 +495,14 @@ full_usage()
        printf("-y Generate a SHA512 password\n");
        printf("-m Generate an MD5 password\n");
        printf("-d Generate a DES password\n");
-       printf("-b Generate a BlowFish password\n");
+       printf("-b Generate a Blowfish password\n");
        printf("-e Generate an Extended DES password\n");
-       printf("-l Specify a length for a random MD5 or BlowFish salt\n");
-       printf("-r Specify a number of rounds for a BlowFish or Extended DES password\n");
-       printf("   BlowFish:  default 4, no more than 6 recommended\n");
+       printf("-l Specify a length for a random MD5 or Blowfish salt\n");
+       printf("-r Specify a number of rounds for a Blowfish or Extended DES password\n");
+       printf("   Blowfish:  default 4, no more than 6 recommended\n");
        printf("   Extended DES:  default 25\n");
        printf("-s Specify a salt, 2 alphanumeric characters for DES, up to 16 for MD5,\n");
-       printf("   up to 22 for BlowFish, and 4 for Extended DES\n");
+       printf("   up to 22 for Blowfish, and 4 for Extended DES\n");
        printf("-p Specify a plaintext password to use\n");
        printf("Example: mkpasswd -m -s 3dr -p test\n");
        exit(0);
@@ -515,7 +515,7 @@ brief_usage()
        printf("Standard DES:  mkpasswd [-d] [-s salt] [-p plaintext]\n");
        printf("Extended DES:  mkpasswd -e [-r rounds] [-s salt] [-p plaintext]\n");
        printf("         MD5:  mkpasswd -m [-l saltlength] [-s salt] [-p plaintext]\n");
-       printf("    BlowFish:  mkpasswd -b [-r rounds] [-l saltlength] [-s salt]\n");
+       printf("    Blowfish:  mkpasswd -b [-r rounds] [-l saltlength] [-s salt]\n");
        printf("                           [-p plaintext]\n");
        printf("Use -h for full usage\n");
        exit(0);