summaryrefslogtreecommitdiffstats
path: root/apps/passwd.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2002-03-22 02:42:57 +0000
committerRichard Levitte <levitte@openssl.org>2002-03-22 02:42:57 +0000
commit125cc35b59597c7613cc1a0e8d396e7e86808cb0 (patch)
tree32ff289b07f2fa7d2470f1c5b7981f4d7bb7518a /apps/passwd.c
parent7e58aa7d71c08929f61d24e221174ed35c210795 (diff)
Merge in DES changed from 0.9.7-stable.
Diffstat (limited to 'apps/passwd.c')
-rw-r--r--apps/passwd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/passwd.c b/apps/passwd.c
index 2023b76f5b..ad8e7b0349 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -16,7 +16,7 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
#ifndef OPENSSL_NO_DES
-# include <openssl/des_old.h>
+# include <openssl/des.h>
#endif
#ifndef NO_MD5CRYPT_1
# include <openssl/evp.h>
@@ -482,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)