projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fast reduction for NIST curves
[openssl.git]
/
apps
/
passwd.c
diff --git
a/apps/passwd.c
b/apps/passwd.c
index d3fa228bdb4149f035a9eeda26e9ef779dcf449e..0c2cf62e8bec2e93f767fa4f99c3a1c848978fd3 100644
(file)
--- a/
apps/passwd.c
+++ b/
apps/passwd.c
@@
-16,10
+16,9
@@
#include <openssl/evp.h>
#include <openssl/rand.h>
#ifndef OPENSSL_NO_DES
#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
#endif
#ifndef NO_MD5CRYPT_1
-# include <openssl/evp.h>
# include <openssl/md5.h>
#endif
# include <openssl/md5.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 (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;
out = BIO_new(BIO_s_file());
if (out == NULL)
goto err;
@@
-479,7
+481,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)
/* 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)
#endif
#ifndef NO_MD5CRYPT_1
if (use1 || useapr1)