Commit b5929507 authored by Ulf Möller's avatar Ulf Möller
Browse files

Update NO_* macros.

parent 61f217ee

apps/enc.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

apps/pkcs12.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

apps/progs.h

+5 −5
Original line number Diff line number Diff line
@@ -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

apps/progs.pl

+1 −1
Original line number Diff line number Diff line
@@ -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;

crypto/crypto.c

+6 −4
Original line number Diff line number Diff line
@@ -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,13 +516,14 @@ 
#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"