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

Make update, deleting bogus DTLS error code

parent f4274da1

apps/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -789,14 +789,14 @@ s_cb.o: ../include/openssl/objects.h ../include/openssl/ocsp.h 
s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

s_cb.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h

s_cb.o: ../include/openssl/sha.h ../include/openssl/ssl.h

s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h

s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h

s_cb.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h

s_cb.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

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

s_cb.o: s_apps.h s_cb.c

s_cb.o: ../include/openssl/pqueue.h ../include/openssl/rand.h

s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h

s_cb.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h

s_cb.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h

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

s_cb.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h

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

s_cb.o: ../include/openssl/x509v3.h apps.h s_apps.h s_cb.c

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

s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h

s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h

ssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -2056,6 +2056,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC	 281

#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG		 148

#define SSL_R_DIGEST_CHECK_FAILED			 149

#define SSL_R_DTLS_MESSAGE_TOO_BIG			 334

#define SSL_R_DUPLICATE_COMPRESSION_ID			 309

#define SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT		 317

#define SSL_R_ECC_CERT_NOT_FOR_SIGNING			 318
@@ -2211,7 +2212,6 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE		 1111

#define SSL_R_TLSV1_UNRECOGNIZED_NAME			 1112

#define SSL_R_TLSV1_UNSUPPORTED_EXTENSION		 1110

#define SSL_R_DTLS_MESSAGE_TOO_BIG			 1200

#define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER	 232

#define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST		 157

#define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233

ssl/ssl_err.c

+1 −1
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC),"decryption failed or bad record mac"},

{ERR_REASON(SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG),"dh public value length is wrong"},

{ERR_REASON(SSL_R_DIGEST_CHECK_FAILED)   ,"digest check failed"},

{ERR_REASON(SSL_R_DTLS_MESSAGE_TOO_BIG)  ,"dtls message too big"},

{ERR_REASON(SSL_R_DUPLICATE_COMPRESSION_ID),"duplicate compression id"},

{ERR_REASON(SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT),"ecc cert not for key agreement"},

{ERR_REASON(SSL_R_ECC_CERT_NOT_FOR_SIGNING),"ecc cert not for signing"},
@@ -490,7 +491,6 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE),"tlsv1 certificate unobtainable"},

{ERR_REASON(SSL_R_TLSV1_UNRECOGNIZED_NAME),"tlsv1 unrecognized name"},

{ERR_REASON(SSL_R_TLSV1_UNSUPPORTED_EXTENSION),"tlsv1 unsupported extension"},

{ERR_REASON(SSL_R_DTLS_MESSAGE_TOO_BIG),"dtls message too big"},

{ERR_REASON(SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER),"tls client cert req with anon cipher"},

{ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),"tls invalid ecpointformat list"},

{ERR_REASON(SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST),"tls peer did not respond with certificate list"},

util/libeay.num

+2 −0
Original line number Diff line number Diff line
@@ -4162,3 +4162,5 @@ ASN1_TIME_set_string 4536 EXIST::FUNCTION: 
EVP_MD_flags                            4537	EXIST::FUNCTION:

TS_RESP_CTX_free                        4538	EXIST::FUNCTION:

ENGINE_load_aesni                       4539	EXIST::FUNCTION:ENGINE

DSAparams_dup                           4540	EXIST::FUNCTION:DSA

DHparams_dup                            4541	EXIST::FUNCTION:DH