diff options
| author | Ulf Möller <ulf@openssl.org> | 1999-04-27 11:56:15 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 1999-04-27 11:56:15 +0000 |
| commit | b5929507e3aa8f359f272148609348d1f2433bf7 (patch) | |
| tree | b70112d1a493a772d2dcadd9c1d84e79017b0bcb /apps | |
| parent | 61f217eec2c1947dec04d3211516fe4f851e4c81 (diff) | |
| download | openssl-b5929507e3aa8f359f272148609348d1f2433bf7.tar.gz | |
Update NO_* macros.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/enc.c | 8 | ||||
| -rw-r--r-- | apps/pkcs12.c | 1 | ||||
| -rw-r--r-- | apps/progs.h | 10 | ||||
| -rw-r--r-- | apps/progs.pl | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/apps/enc.c b/apps/enc.c index ca5691dd33..35e33c70be 100644 --- a/apps/enc.c +++ b/apps/enc.c @@ -232,7 +232,7 @@ bad: #ifndef NO_RC4 BIO_printf(bio_err,"rc2 :128 bit key RC2 encryption\n"); #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF BIO_printf(bio_err,"bf :128 bit key BlowFish encryption\n"); #endif #ifndef NO_RC4 @@ -270,19 +270,19 @@ bad: LN_rc2_cfb64, LN_rc2_ofb64); BIO_printf(bio_err," -%-4s (%s)\n","rc2", LN_rc2_cbc); #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s", LN_bf_ecb, LN_bf_cbc, LN_bf_cfb64, LN_bf_ofb64); BIO_printf(bio_err," -%-4s (%s)\n","bf", LN_bf_cbc); #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s", LN_cast5_ecb, LN_cast5_cbc, LN_cast5_cfb64, LN_cast5_ofb64); BIO_printf(bio_err," -%-4s (%s)\n","cast", LN_cast5_cbc); #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s", LN_rc5_ecb, LN_rc5_cbc, LN_rc5_cfb64, LN_rc5_ofb64); diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 95974f8917..89ee3a7b79 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -59,6 +59,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <openssl/des.h> #include <openssl/pem.h> #include <openssl/err.h> #include <openssl/pkcs12.h> diff --git a/apps/progs.h b/apps/progs.h index f428998922..a37d7e42ff 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -115,7 +115,7 @@ FUNCTION functions[] = { #ifndef NO_RC2 {FUNC_TYPE_CIPHER,"rc2",enc_main}, #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF {FUNC_TYPE_CIPHER,"bf",enc_main}, #endif #ifndef NO_CAST @@ -184,16 +184,16 @@ FUNCTION functions[] = { #ifndef NO_RC2 {FUNC_TYPE_CIPHER,"rc2-ofb",enc_main}, #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF {FUNC_TYPE_CIPHER,"bf-cbc",enc_main}, #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF {FUNC_TYPE_CIPHER,"bf-ecb",enc_main}, #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF {FUNC_TYPE_CIPHER,"bf-cfb",enc_main}, #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF {FUNC_TYPE_CIPHER,"bf-ofb",enc_main}, #endif #ifndef NO_CAST diff --git a/apps/progs.pl b/apps/progs.pl index 16ce5ed562..7a69fc7b18 100644 --- a/apps/progs.pl +++ b/apps/progs.pl @@ -66,7 +66,7 @@ foreach ( elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; } elsif ($_ =~ /rc4/) { $t="#ifndef NO_RC4\n${t}#endif\n"; } elsif ($_ =~ /rc2/) { $t="#ifndef NO_RC2\n${t}#endif\n"; } - elsif ($_ =~ /bf/) { $t="#ifndef NO_BLOWFISH\n${t}#endif\n"; } + elsif ($_ =~ /bf/) { $t="#ifndef NO_BF\n${t}#endif\n"; } elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; } elsif ($_ =~ /rc5/) { $t="#ifndef NO_RC5\n${t}#endif\n"; } print $t; |