Commit 3ed3603b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update default dependency flags. 

Make error name discrepancies a fatal error.
Fix error codes.
make update
parent f2589af1

Configure

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ my @experimental = (); 


# This is what $depflags will look like with the above defaults

# (we need this to see if we should advise the user to run "make depend"):

my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";

my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";



# Explicit "no-..." options will be collected in %disabled along with the defaults.

# To remove something from %disabled, use "enable-foo" (unless it's experimental).

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ tags: 
errors:

	$(PERL) util/mkerr.pl -recurse -write

	(cd engines; $(MAKE) PERL=$(PERL) errors)

	$(PERL) util/ck_errf.pl */*.c */*/*.c

	$(PERL) util/ck_errf.pl -strict */*.c */*/*.c



stacks:

	$(PERL) util/mkstack.pl -write

TABLE

+93 −0
Original line number Diff line number Diff line
@@ -1953,6 +1953,68 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** debug-linux-generic32

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$perlasm_scheme = void

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 



*** debug-linux-generic64

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$perlasm_scheme = void

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 



*** debug-linux-ia32-aes

$cc           = gcc

$cflags       = -DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
@@ -2046,6 +2108,37 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** debug-linux-x86_64

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall -DMD32_REG_T=int

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL

$cpuid_obj    = x86_64cpuid.o

$bn_obj       = x86_64-gcc.o x86_64-mont.o

$des_obj      = 

$aes_obj      = aes-x86_64.o aesni-x86_64.o

$bf_obj       = 

$md5_obj      = md5-x86_64.o

$sha1_obj     = sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o

$cast_obj     = 

$rc4_obj      = rc4-x86_64.o

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = wp-x86_64.o

$cmll_obj     = cmll-x86_64.o cmll_misc.o

$perlasm_scheme = elf

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = -m64

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 64



*** debug-rse

$cc           = cc

$cflags       = -DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall

apps/Makefile

+14 −13
Original line number Diff line number Diff line
@@ -933,19 +933,20 @@ speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h 
speed.o: ../include/openssl/err.h ../include/openssl/evp.h

speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h

speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h

speed.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h

speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h

speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h

speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h

speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

speed.o: ../include/openssl/seed.h ../include/openssl/sha.h

speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h

speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h

speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h

speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h

speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

speed.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h

speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h

speed.o: ../include/openssl/safestack.h ../include/openssl/seed.h

speed.o: ../include/openssl/sha.h ../include/openssl/stack.h

speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h

speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h

speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

speed.o: speed.c testdsa.h testrsa.h

spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h

spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h

crypto/evp/Makefile

+14 −6
Original line number Diff line number Diff line
@@ -470,13 +470,21 @@ m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 
m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c

m_mdc2.o: ../../e_os.h ../../include/openssl/bio.h

m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

m_mdc2.o: ../../include/openssl/symhacks.h ../cryptlib.h m_mdc2.c

m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h

m_mdc2.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

m_mdc2.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h

m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h

m_mdc2.o: ../../include/openssl/lhash.h ../../include/openssl/mdc2.h

m_mdc2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

m_mdc2.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h

m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

m_mdc2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h

m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_mdc2.c

m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h

m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h