Fix for CVE-2007-4995 from OpenSSL CVS
This commit is contained in:
parent
7af5b3f24d
commit
c9951c135d
14
crypto/dist/openssl/ssl/Makefile
vendored
14
crypto/dist/openssl/ssl/Makefile
vendored
@ -238,13 +238,13 @@ d1_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
d1_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
|
||||
d1_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
|
||||
d1_pkt.o: ../include/openssl/pq_compat.h ../include/openssl/pqueue.h
|
||||
d1_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
|
||||
d1_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
|
||||
d1_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
|
||||
d1_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
|
||||
d1_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
|
||||
d1_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_pkt.c
|
||||
d1_pkt.o: ssl_locl.h
|
||||
d1_pkt.o: ../include/openssl/rand.h ../include/openssl/rsa.h
|
||||
d1_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
|
||||
d1_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
|
||||
d1_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
|
||||
d1_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
|
||||
d1_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
|
||||
d1_pkt.o: ../include/openssl/x509_vfy.h d1_pkt.c ssl_locl.h
|
||||
d1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
|
||||
d1_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
|
||||
d1_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
|
||||
|
1136
crypto/dist/openssl/ssl/d1_both.c
vendored
1136
crypto/dist/openssl/ssl/d1_both.c
vendored
File diff suppressed because it is too large
Load Diff
7
crypto/dist/openssl/ssl/dtls1.h
vendored
7
crypto/dist/openssl/ssl/dtls1.h
vendored
@ -67,9 +67,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define DTLS1_VERSION 0x0100
|
||||
#define DTLS1_VERSION_MAJOR 0x01
|
||||
#define DTLS1_VERSION_MINOR 0x00
|
||||
#define DTLS1_VERSION 0xFEFF
|
||||
#define DTLS1_BAD_VER 0x0100
|
||||
|
||||
#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110
|
||||
|
||||
@ -83,7 +82,7 @@ extern "C" {
|
||||
#define DTLS1_HM_BAD_FRAGMENT -2
|
||||
#define DTLS1_HM_FRAGMENT_RETRY -3
|
||||
|
||||
#define DTLS1_CCS_HEADER_LENGTH 3
|
||||
#define DTLS1_CCS_HEADER_LENGTH 1
|
||||
|
||||
#define DTLS1_AL_HEADER_LENGTH 7
|
||||
|
||||
|
1
crypto/dist/openssl/ssl/ssl.h
vendored
1
crypto/dist/openssl/ssl/ssl.h
vendored
@ -1564,6 +1564,7 @@ void ERR_load_SSL_strings(void);
|
||||
#define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT 253
|
||||
#define SSL_F_DTLS1_GET_RECORD 254
|
||||
#define SSL_F_DTLS1_OUTPUT_CERT_CHAIN 255
|
||||
#define SSL_F_DTLS1_PREPROCESS_FRAGMENT 277
|
||||
#define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE 256
|
||||
#define SSL_F_DTLS1_PROCESS_RECORD 257
|
||||
#define SSL_F_DTLS1_READ_BYTES 258
|
||||
|
1
crypto/dist/openssl/ssl/ssl_err.c
vendored
1
crypto/dist/openssl/ssl/ssl_err.c
vendored
@ -87,6 +87,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
|
||||
{ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT), "DTLS1_GET_MESSAGE_FRAGMENT"},
|
||||
{ERR_FUNC(SSL_F_DTLS1_GET_RECORD), "DTLS1_GET_RECORD"},
|
||||
{ERR_FUNC(SSL_F_DTLS1_OUTPUT_CERT_CHAIN), "DTLS1_OUTPUT_CERT_CHAIN"},
|
||||
{ERR_FUNC(SSL_F_DTLS1_PREPROCESS_FRAGMENT), "DTLS1_PREPROCESS_FRAGMENT"},
|
||||
{ERR_FUNC(SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE), "DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE"},
|
||||
{ERR_FUNC(SSL_F_DTLS1_PROCESS_RECORD), "DTLS1_PROCESS_RECORD"},
|
||||
{ERR_FUNC(SSL_F_DTLS1_READ_BYTES), "DTLS1_READ_BYTES"},
|
||||
|
Loading…
x
Reference in New Issue
Block a user