Commit 5a96822f 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 23b34259

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).

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

ssl/d1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ int dtls1_handle_timeout(SSL *s) 
	if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)

		{

		/* fail the connection, enough alerts have been sent */

		SSLerr(SSL_F_DTLS1_READ_FAILED,SSL_R_READ_TIMEOUT_EXPIRED);

		SSLerr(SSL_F_DTLS1_HANDLE_TIMEOUT,SSL_R_READ_TIMEOUT_EXPIRED);

		return 0;

		}

ssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -1811,6 +1811,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_F_DTLS1_GET_MESSAGE				 252

#define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT		 253

#define SSL_F_DTLS1_GET_RECORD				 254

#define SSL_F_DTLS1_HANDLE_TIMEOUT			 297

#define SSL_F_DTLS1_OUTPUT_CERT_CHAIN			 255

#define SSL_F_DTLS1_PREPROCESS_FRAGMENT			 288

#define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE		 256