From b5929507e3aa8f359f272148609348d1f2433bf7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulf=20M=C3=B6ller?= Date: Tue, 27 Apr 1999 11:56:15 +0000 Subject: [PATCH] Update NO_* macros. --- apps/enc.c | 8 ++++---- apps/pkcs12.c | 1 + apps/progs.h | 10 +++++----- apps/progs.pl | 2 +- crypto/crypto.c | 10 ++++++---- crypto/evp/c_all.c | 6 +++--- crypto/evp/e_cbc_bf.c | 3 +-- crypto/evp/e_cfb_bf.c | 3 +-- crypto/evp/e_ecb_bf.c | 3 +-- crypto/evp/e_ofb_bf.c | 3 +-- util/mk1mf.pl | 4 ++-- 11 files changed, 26 insertions(+), 27 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 #include #include +#include #include #include #include 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; diff --git a/crypto/crypto.c b/crypto/crypto.c index 2011dc368c..2387933b5e 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -361,7 +361,7 @@ #include "evp/e_ecb_r2.c" #include "evp/e_ofb_r2.c" #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF #include "evp/e_cbc_bf.c" #include "evp/e_cfb_bf.c" #include "evp/e_ecb_bf.c" @@ -403,7 +403,7 @@ #endif #ifdef CRYPTO_BLOWFISH_SUBSET -#ifndef NO_BLOWFISH +#ifndef NO_BF #include "bf/bf_cfb64.c" #include "bf/bf_ecb.c" #ifndef BF_ASM @@ -505,6 +505,7 @@ #endif #endif +#ifndef NO_SHA #ifdef CRYPTO_SHA1_SUBSET #ifndef NO_SHA1 #include "sha/sha1_one.c" @@ -515,14 +516,15 @@ #endif #ifdef CRYPTO_SHA_SUBSET -#ifndef NO_SHA +#ifndef NO_SHA0 #include "evp/m_dss.c" #include "sha/sha_dgst.c" #include "sha/sha_one.c" #include "evp/m_sha.c" #endif #endif - +#endif + #ifdef CRYPTO_STACK_SUBSET #include "stack/stack.c" #endif diff --git a/crypto/evp/c_all.c b/crypto/evp/c_all.c index b48563e3c0..278e9e4dcf 100644 --- a/crypto/evp/c_all.c +++ b/crypto/evp/c_all.c @@ -121,7 +121,7 @@ void SSLeay_add_all_ciphers(void) EVP_add_cipher_alias(SN_rc2_cbc,"rc2"); #endif -#ifndef NO_BLOWFISH +#ifndef NO_BF EVP_add_cipher(EVP_bf_ecb()); EVP_add_cipher(EVP_bf_cfb()); EVP_add_cipher(EVP_bf_ofb()); @@ -169,7 +169,7 @@ void SSLeay_add_all_digests(void) EVP_add_digest(EVP_dss()); #endif #endif -#ifndef NO_SHA1 +#ifndef NO_SHA EVP_add_digest(EVP_sha1()); EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); @@ -183,7 +183,7 @@ void SSLeay_add_all_digests(void) #if !defined(NO_MDC2) && !defined(NO_DES) EVP_add_digest(EVP_mdc2()); #endif -#ifndef NO_RMD160 +#ifndef NO_RIPEMD EVP_add_digest(EVP_ripemd160()); EVP_add_digest_alias(SN_ripemd160,"ripemd"); EVP_add_digest_alias(SN_ripemd160,"rmd160"); diff --git a/crypto/evp/e_cbc_bf.c b/crypto/evp/e_cbc_bf.c index a523d011c2..a55b842667 100644 --- a/crypto/evp/e_cbc_bf.c +++ b/crypto/evp/e_cbc_bf.c @@ -56,8 +56,7 @@ * [including the GNU Public Licence.] */ -#ifndef NO_BLOWFISH - +#ifndef NO_BF #include #include "cryptlib.h" #include diff --git a/crypto/evp/e_cfb_bf.c b/crypto/evp/e_cfb_bf.c index 0fb4d7fc32..63e1e624ea 100644 --- a/crypto/evp/e_cfb_bf.c +++ b/crypto/evp/e_cfb_bf.c @@ -56,8 +56,7 @@ * [including the GNU Public Licence.] */ -#ifndef NO_BLOWFISH - +#ifndef NO_BF #include #include "cryptlib.h" #include diff --git a/crypto/evp/e_ecb_bf.c b/crypto/evp/e_ecb_bf.c index d6924ac870..334736d253 100644 --- a/crypto/evp/e_ecb_bf.c +++ b/crypto/evp/e_ecb_bf.c @@ -56,8 +56,7 @@ * [including the GNU Public Licence.] */ -#ifndef NO_BLOWFISH - +#ifndef NO_BF #include #include "cryptlib.h" #include diff --git a/crypto/evp/e_ofb_bf.c b/crypto/evp/e_ofb_bf.c index 52a6f5729c..c82154b549 100644 --- a/crypto/evp/e_ofb_bf.c +++ b/crypto/evp/e_ofb_bf.c @@ -56,8 +56,7 @@ * [including the GNU Public Licence.] */ -#ifndef NO_BLOWFISH - +#ifndef NO_BF #include #include "cryptlib.h" #include diff --git a/util/mk1mf.pl b/util/mk1mf.pl index c936d785cf..4a71f98293 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -214,9 +214,9 @@ $cflags.=" -DNO_MD2" if $no_md2; $cflags.=" -DNO_MD5" if $no_md5; $cflags.=" -DNO_SHA" if $no_sha; $cflags.=" -DNO_SHA1" if $no_sha1; -$cflags.=" -DNO_RMD160" if $no_rmd160; +$cflags.=" -DNO_RIPEMD" if $no_rmd160; $cflags.=" -DNO_MDC2" if $no_mdc2; -$cflags.=" -DNO_BLOWFISH" if $no_bf; +$cflags.=" -DNO_BF" if $no_bf; $cflags.=" -DNO_CAST" if $no_cast; $cflags.=" -DNO_DES" if $no_des; $cflags.=" -DNO_RSA" if $no_rsa; -- 2.25.1