Update NO_* macros.

[openssl.git] / apps / enc.c

diff --git a/apps/enc.c b/apps/enc.c
index 84a81ffb2306e49df0f3135a8f726bae5c98e045..35e33c70be29f4ba0edd0dd6d3ac09666a178ba6 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -65,17 +65,12 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#ifdef NO_MD5
+#ifndef NO_MD5
 #include <openssl/md5.h>
 #endif
 #include <openssl/pem.h>
 
-#ifndef NOPROTO
 int set_hex(char *in,unsigned char *out,int size);
-#else
-int set_hex();
-#endif
-
 #undef SIZE
 #undef BSIZE
 #undef PROG
@@ -237,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
@@ -275,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);