diff options
| author | Bodo Möller <bodo@openssl.org> | 2000-02-11 17:18:50 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2000-02-11 17:18:50 +0000 |
| commit | 3ebf0be142ea19ee2b452d9403d6bc5b14cc41ae (patch) | |
| tree | 0cb70f1dd56bbf6c93cbd4163e8df0b0b6e387c9 | |
| parent | cbcc5c01f964e104bee9a2d5d94795be0a72eb7d (diff) | |
| download | openssl-3ebf0be142ea19ee2b452d9403d6bc5b14cc41ae.tar.gz | |
Corrections.
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | apps/passwd.c | 19 |
3 files changed, 14 insertions, 9 deletions
@@ -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. diff --git a/Makefile.org b/Makefile.org index 257f6a5b66..d4f381e694 100644 --- a/Makefile.org +++ b/Makefile.org @@ -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 diff --git a/apps/passwd.c b/apps/passwd.c index 7e3eb7af16..06155979f4 100644 --- a/apps/passwd.c +++ b/apps/passwd.c @@ -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; } -#endif - +#else +int MAIN(int argc, char **argv) + { + fputs("Program not available.\n", stderr) + EXIT(1); + } +#endif |