mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Corrections.
This commit is contained in:
parent
cbcc5c01f9
commit
3ebf0be142
2
CHANGES
2
CHANGES
@ -4,7 +4,7 @@
|
||||
|
||||
Changes between 0.9.4 and 0.9.5 [xx XXX 2000]
|
||||
|
||||
*) New 'passwd' tool, currently only -fcrypt is implemented.
|
||||
*) New 'passwd' tool for crypt(3) and apr1 password hashes.
|
||||
[Bodo Moeller]
|
||||
|
||||
*) Add command line password options to the remaining applications.
|
||||
|
@ -262,7 +262,7 @@ dclean:
|
||||
rehash: rehash.time
|
||||
rehash.time: certs
|
||||
@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)
|
||||
touch .rehash.time
|
||||
touch rehash.time
|
||||
|
||||
test: tests
|
||||
|
||||
|
@ -1,6 +1,10 @@
|
||||
/* apps/passwd.c */
|
||||
|
||||
#if !defined(NO_DES) || !defined(NO_MD5)
|
||||
#if defined NO_MD5 || defined CHARSET_EBCDIC
|
||||
# define NO_APR1
|
||||
#endif
|
||||
|
||||
#if !defined(NO_DES) || !defined(NO_APR1)
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
@ -12,10 +16,6 @@
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/rand.h>
|
||||
|
||||
#if defined NO_MD5 || defined CHARSET_EBCDIC
|
||||
# define NO_APR1
|
||||
#endif
|
||||
|
||||
#ifndef NO_DES
|
||||
# include <openssl/des.h>
|
||||
#endif
|
||||
@ -461,6 +461,11 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
|
||||
err:
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
|
||||
int MAIN(int argc, char **argv)
|
||||
{
|
||||
fputs("Program not available.\n", stderr)
|
||||
EXIT(1);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user