const fixes

[openssl.git] / apps / passwd.c

diff --git a/apps/passwd.c b/apps/passwd.c
index 53dbe073d2375f57586ec69c449d53b3376f6ac7..6965c6e0902a49f4985fa85a120f286e0a86889b 100644 (file)
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -15,7 +15,6 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
-
 #ifndef OPENSSL_NO_DES
 # include <openssl/des.h>
 #endif
@@ -79,6 +78,9 @@ int MAIN(int argc, char **argv)
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+
+       if (!load_config(bio_err, NULL))
+               goto err;
        out = BIO_new(BIO_s_file());
        if (out == NULL)
                goto err;
@@ -289,7 +291,8 @@ err:
                BIO_free(in);
        if (out)
                BIO_free_all(out);
-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }
 
 
@@ -309,8 +312,9 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
        static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */
        unsigned char buf[MD5_DIGEST_LENGTH];
        char *salt_out;
-       int n, i;
-       MD5_CTX md;
+       int n;
+       unsigned int i;
+       EVP_MD_CTX md,md2;
        size_t passwd_len, salt_len;
 
        passwd_len = strlen(passwd);
@@ -325,49 +329,47 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
        salt_len = strlen(salt_out);
        assert(salt_len <= 8);
        
-       MD5_Init(&md);
-       MD5_Update(&md, passwd, passwd_len);
-       MD5_Update(&md, "$", 1);
-       MD5_Update(&md, magic, strlen(magic));
-       MD5_Update(&md, "$", 1);
-       MD5_Update(&md, salt_out, salt_len);
+       EVP_MD_CTX_init(&md);
+       EVP_DigestInit_ex(&md,EVP_md5(), NULL);
+       EVP_DigestUpdate(&md, passwd, passwd_len);
+       EVP_DigestUpdate(&md, "$", 1);
+       EVP_DigestUpdate(&md, magic, strlen(magic));
+       EVP_DigestUpdate(&md, "$", 1);
+       EVP_DigestUpdate(&md, salt_out, salt_len);
        
-        {
-               MD5_CTX md2;
+       EVP_MD_CTX_init(&md2);
+       EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
+       EVP_DigestUpdate(&md2, passwd, passwd_len);
+       EVP_DigestUpdate(&md2, salt_out, salt_len);
+       EVP_DigestUpdate(&md2, passwd, passwd_len);
+       EVP_DigestFinal_ex(&md2, buf, NULL);
 
-               MD5_Init(&md2);
-               MD5_Update(&md2, passwd, passwd_len);
-               MD5_Update(&md2, salt_out, salt_len);
-               MD5_Update(&md2, passwd, passwd_len);
-               MD5_Final(buf, &md2);
-        }
        for (i = passwd_len; i > sizeof buf; i -= sizeof buf)
-               MD5_Update(&md, buf, sizeof buf);
-       MD5_Update(&md, buf, i);
+               EVP_DigestUpdate(&md, buf, sizeof buf);
+       EVP_DigestUpdate(&md, buf, i);
        
        n = passwd_len;
        while (n)
                {
-               MD5_Update(&md, (n & 1) ? "\0" : passwd, 1);
+               EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
                n >>= 1;
                }
-       MD5_Final(buf, &md);
+       EVP_DigestFinal_ex(&md, buf, NULL);
 
        for (i = 0; i < 1000; i++)
                {
-               MD5_CTX md2;
-
-               MD5_Init(&md2);
-               MD5_Update(&md2, (i & 1) ? (unsigned char *) passwd : buf,
-                                (i & 1) ? passwd_len : sizeof buf);
+               EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
+               EVP_DigestUpdate(&md2, (i & 1) ? (unsigned const char *) passwd : buf,
+                                      (i & 1) ? passwd_len : sizeof buf);
                if (i % 3)
-                       MD5_Update(&md2, salt_out, salt_len);
+                       EVP_DigestUpdate(&md2, salt_out, salt_len);
                if (i % 7)
-                       MD5_Update(&md2, passwd, passwd_len);
-               MD5_Update(&md2, (i & 1) ? buf : (unsigned char *) passwd,
-                                (i & 1) ? sizeof buf : passwd_len);
-               MD5_Final(buf, &md2);
+                       EVP_DigestUpdate(&md2, passwd, passwd_len);
+               EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned const char *) passwd,
+                                      (i & 1) ? sizeof buf : passwd_len);
+               EVP_DigestFinal_ex(&md2, buf, NULL);
                }
+       EVP_MD_CTX_cleanup(&md2);
        
         {
                /* transform buf into output string */
@@ -405,6 +407,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
                *output = 0;
                assert(strlen(out_buf) < sizeof(out_buf));
         }
+       EVP_MD_CTX_cleanup(&md);
 
        return out_buf;
        }
@@ -479,7 +482,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
        /* now compute password hash */
 #ifndef OPENSSL_NO_DES
        if (usecrypt)
-               hash = des_crypt(passwd, *salt_p);
+               hash = DES_crypt(passwd, *salt_p);
 #endif
 #ifndef NO_MD5CRYPT_1
        if (use1 || useapr1)
@@ -503,6 +506,6 @@ err:
 int MAIN(int argc, char **argv)
        {
        fputs("Program not available.\n", stderr)
-       EXIT(1);
+       OPENSSL_EXIT(1);
        }
 #endif