diff options
author | Rich Salz <rsalz@openssl.org> | 2016-01-07 15:06:38 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-01-07 15:14:18 -0500 |
commit | bbd86bf5424a611cb6b77a3a17fc522931c4dcb8 (patch) | |
tree | cc45d4fb29946c41879e563547a877a70b0c957a /ssl | |
parent | 3cb8c3265f639f8eebf32053457ae6a6d61e2413 (diff) |
mem functions cleanup
Only two macros CRYPTO_MDEBUG and CRYPTO_MDEBUG_ABORT to control this.
If CRYPTO_MDEBUG is not set, #ifdef out the whole debug machinery.
(Thanks to Jakob Bohm for the suggestion!)
Make the "change wrapper functions" be the only paradigm.
Wrote documentation!
Format the 'set func' functions so their paramlists are legible.
Format some multi-line comments.
Remove ability to get/set the "memory debug" functions at runtme.
Remove MemCheck_* and CRYPTO_malloc_debug_init macros.
Add CRYPTO_mem_debug(int flag) function.
Add test/memleaktest.
Rename CRYPTO_malloc_init to OPENSSL_malloc_init; remove needless calls.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/Makefile | 146 | ||||
-rw-r--r-- | ssl/ssl_ciph.c | 20 | ||||
-rw-r--r-- | ssl/ssl_err.c | 78 |
3 files changed, 127 insertions, 117 deletions
diff --git a/ssl/Makefile b/ssl/Makefile index f398c9af20..bb61875510 100644 --- a/ssl/Makefile +++ b/ssl/Makefile @@ -98,7 +98,8 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -bio_ssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +bio_ssl.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +bio_ssl.o: ../include/openssl/asn1.h ../include/openssl/async.h bio_ssl.o: ../include/openssl/bio.h ../include/openssl/bn.h bio_ssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h bio_ssl.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -117,7 +118,8 @@ bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h bio_ssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h bio_ssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bio_ssl.c bio_ssl.o: packet_locl.h record/record.h ssl_locl.h statem/statem.h -d1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +d1_lib.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +d1_lib.o: ../include/openssl/asn1.h ../include/openssl/async.h d1_lib.o: ../include/openssl/bio.h ../include/openssl/bn.h d1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h d1_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -137,7 +139,8 @@ d1_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h d1_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h d1_lib.o: ../include/openssl/x509_vfy.h d1_lib.c packet_locl.h record/record.h d1_lib.o: ssl_locl.h statem/statem.h -d1_msg.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +d1_msg.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +d1_msg.o: ../include/openssl/asn1.h ../include/openssl/async.h d1_msg.o: ../include/openssl/bio.h ../include/openssl/bn.h d1_msg.o: ../include/openssl/buffer.h ../include/openssl/comp.h d1_msg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -156,7 +159,8 @@ d1_msg.o: ../include/openssl/ssl3.h ../include/openssl/stack.h d1_msg.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h d1_msg.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_msg.c d1_msg.o: packet_locl.h record/record.h ssl_locl.h statem/statem.h -d1_srtp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +d1_srtp.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +d1_srtp.o: ../include/openssl/asn1.h ../include/openssl/async.h d1_srtp.o: ../include/openssl/bio.h ../include/openssl/bn.h d1_srtp.o: ../include/openssl/buffer.h ../include/openssl/comp.h d1_srtp.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -175,7 +179,8 @@ d1_srtp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h d1_srtp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h d1_srtp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srtp.c d1_srtp.o: packet_locl.h record/record.h ssl_locl.h statem/statem.h -methods.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +methods.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +methods.o: ../include/openssl/asn1.h ../include/openssl/async.h methods.o: ../include/openssl/bio.h ../include/openssl/bn.h methods.o: ../include/openssl/buffer.h ../include/openssl/comp.h methods.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -194,7 +199,8 @@ methods.o: ../include/openssl/ssl3.h ../include/openssl/stack.h methods.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h methods.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h methods.c methods.o: packet_locl.h record/record.h ssl_locl.h statem/statem.h -record/dtls1_bitmap.o: ../e_os.h ../include/openssl/asn1.h +record/dtls1_bitmap.o: ../e_os.h ../include/internal/dane.h +record/dtls1_bitmap.o: ../include/internal/numbers.h ../include/openssl/asn1.h record/dtls1_bitmap.o: ../include/openssl/async.h ../include/openssl/bio.h record/dtls1_bitmap.o: ../include/openssl/bn.h ../include/openssl/buffer.h record/dtls1_bitmap.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -218,7 +224,8 @@ record/dtls1_bitmap.o: ../include/openssl/x509_vfy.h record/../packet_locl.h record/dtls1_bitmap.o: record/../record/record.h record/../ssl_locl.h record/dtls1_bitmap.o: record/../statem/statem.h record/dtls1_bitmap.c record/dtls1_bitmap.o: record/record_locl.h -record/rec_layer_d1.o: ../e_os.h ../include/openssl/asn1.h +record/rec_layer_d1.o: ../e_os.h ../include/internal/dane.h +record/rec_layer_d1.o: ../include/internal/numbers.h ../include/openssl/asn1.h record/rec_layer_d1.o: ../include/openssl/async.h ../include/openssl/bio.h record/rec_layer_d1.o: ../include/openssl/bn.h ../include/openssl/buffer.h record/rec_layer_d1.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -242,7 +249,8 @@ record/rec_layer_d1.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h record/rec_layer_d1.o: record/../packet_locl.h record/../record/record.h record/rec_layer_d1.o: record/../ssl_locl.h record/../statem/statem.h record/rec_layer_d1.o: record/rec_layer_d1.c record/record_locl.h -record/rec_layer_s3.o: ../e_os.h ../include/openssl/asn1.h +record/rec_layer_s3.o: ../e_os.h ../include/internal/dane.h +record/rec_layer_s3.o: ../include/internal/numbers.h ../include/openssl/asn1.h record/rec_layer_s3.o: ../include/openssl/async.h ../include/openssl/bio.h record/rec_layer_s3.o: ../include/openssl/bn.h ../include/openssl/buffer.h record/rec_layer_s3.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -266,7 +274,8 @@ record/rec_layer_s3.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h record/rec_layer_s3.o: record/../packet_locl.h record/../record/record.h record/rec_layer_s3.o: record/../ssl_locl.h record/../statem/statem.h record/rec_layer_s3.o: record/rec_layer_s3.c record/record_locl.h -record/ssl3_buffer.o: ../e_os.h ../include/openssl/asn1.h +record/ssl3_buffer.o: ../e_os.h ../include/internal/dane.h +record/ssl3_buffer.o: ../include/internal/numbers.h ../include/openssl/asn1.h record/ssl3_buffer.o: ../include/openssl/async.h ../include/openssl/bio.h record/ssl3_buffer.o: ../include/openssl/bn.h ../include/openssl/buffer.h record/ssl3_buffer.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -290,6 +299,7 @@ record/ssl3_buffer.o: record/../record/record.h record/../ssl_locl.h record/ssl3_buffer.o: record/../statem/statem.h record/record_locl.h record/ssl3_buffer.o: record/ssl3_buffer.c record/ssl3_record.o: ../e_os.h ../include/internal/constant_time_locl.h +record/ssl3_record.o: ../include/internal/dane.h ../include/internal/numbers.h record/ssl3_record.o: ../include/openssl/asn1.h ../include/openssl/async.h record/ssl3_record.o: ../include/openssl/bio.h ../include/openssl/bn.h record/ssl3_record.o: ../include/openssl/buffer.h ../include/openssl/comp.h @@ -314,6 +324,7 @@ record/ssl3_record.o: record/../packet_locl.h record/../record/record.h record/ssl3_record.o: record/../ssl_locl.h record/../statem/statem.h record/ssl3_record.o: record/record_locl.h record/ssl3_record.c s3_cbc.o: ../e_os.h ../include/internal/constant_time_locl.h +s3_cbc.o: ../include/internal/dane.h ../include/internal/numbers.h s3_cbc.o: ../include/openssl/asn1.h ../include/openssl/async.h s3_cbc.o: ../include/openssl/bio.h ../include/openssl/bn.h s3_cbc.o: ../include/openssl/buffer.h ../include/openssl/comp.h @@ -334,7 +345,8 @@ s3_cbc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h s3_cbc.o: ../include/openssl/tls1.h ../include/openssl/x509.h s3_cbc.o: ../include/openssl/x509_vfy.h packet_locl.h record/record.h s3_cbc.c s3_cbc.o: ssl_locl.h statem/statem.h -s3_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +s3_enc.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +s3_enc.o: ../include/openssl/asn1.h ../include/openssl/async.h s3_enc.o: ../include/openssl/bio.h ../include/openssl/bn.h s3_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h s3_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -354,7 +366,8 @@ s3_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h s3_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h s3_enc.o: ../include/openssl/x509_vfy.h packet_locl.h record/record.h s3_enc.c s3_enc.o: ssl_locl.h statem/statem.h -s3_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +s3_lib.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +s3_lib.o: ../include/openssl/asn1.h ../include/openssl/async.h s3_lib.o: ../include/openssl/bio.h ../include/openssl/bn.h s3_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h s3_lib.o: ../include/openssl/crypto.h ../include/openssl/dh.h @@ -375,7 +388,8 @@ s3_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h s3_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h s3_lib.o: ../include/openssl/x509_vfy.h packet_locl.h record/record.h s3_lib.c s3_lib.o: ssl_locl.h statem/statem.h -s3_msg.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +s3_msg.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +s3_msg.o: ../include/openssl/asn1.h ../include/openssl/async.h s3_msg.o: ../include/openssl/bio.h ../include/openssl/bn.h s3_msg.o: ../include/openssl/buffer.h ../include/openssl/comp.h s3_msg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -394,7 +408,8 @@ s3_msg.o: ../include/openssl/ssl3.h ../include/openssl/stack.h s3_msg.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h s3_msg.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h packet_locl.h s3_msg.o: record/record.h s3_msg.c ssl_locl.h statem/statem.h -ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_algs.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_algs.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_algs.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_algs.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_algs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -413,7 +428,8 @@ ssl_algs.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssl_algs.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssl_algs.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_algs.o: packet_locl.h record/record.h ssl_algs.c ssl_locl.h statem/statem.h -ssl_asn1.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/asn1t.h +ssl_asn1.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_asn1.o: ../include/openssl/asn1.h ../include/openssl/asn1t.h ssl_asn1.o: ../include/openssl/async.h ../include/openssl/bio.h ssl_asn1.o: ../include/openssl/bn.h ../include/openssl/buffer.h ssl_asn1.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -433,7 +449,8 @@ ssl_asn1.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_asn1.o: ../include/openssl/tls1.h ../include/openssl/x509.h ssl_asn1.o: ../include/openssl/x509_vfy.h packet_locl.h record/record.h ssl_asn1.o: ssl_asn1.c ssl_locl.h statem/statem.h -ssl_cert.o: ../e_os.h ../include/internal/o_dir.h ../include/openssl/asn1.h +ssl_cert.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_cert.o: ../include/internal/o_dir.h ../include/openssl/asn1.h ssl_cert.o: ../include/openssl/async.h ../include/openssl/bio.h ssl_cert.o: ../include/openssl/bn.h ../include/openssl/buffer.h ssl_cert.o: ../include/openssl/comp.h ../include/openssl/conf.h @@ -454,7 +471,8 @@ ssl_cert.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_cert.o: ../include/openssl/tls1.h ../include/openssl/x509.h ssl_cert.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h ssl_cert.o: packet_locl.h record/record.h ssl_cert.c ssl_locl.h statem/statem.h -ssl_ciph.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_ciph.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_ciph.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_ciph.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_ciph.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_ciph.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -474,7 +492,8 @@ ssl_ciph.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_ciph.o: ../include/openssl/tls1.h ../include/openssl/x509.h ssl_ciph.o: ../include/openssl/x509_vfy.h packet_locl.h record/record.h ssl_ciph.o: ssl_ciph.c ssl_locl.h statem/statem.h -ssl_conf.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_conf.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_conf.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_conf.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_conf.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_conf.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -526,7 +545,8 @@ ssl_err2.o: ../include/openssl/ssl2.h ../include/openssl/ssl3.h ssl_err2.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_err2.o: ../include/openssl/tls1.h ../include/openssl/x509.h ssl_err2.o: ../include/openssl/x509_vfy.h ssl_err2.c -ssl_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_lib.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_lib.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_lib.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -548,7 +568,8 @@ ssl_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h ssl_lib.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h ssl_lib.o: packet_locl.h record/record.h ssl_lib.c ssl_locl.h statem/statem.h -ssl_mcnf.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_mcnf.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_mcnf.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_mcnf.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_mcnf.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_mcnf.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -568,7 +589,8 @@ ssl_mcnf.o: ../include/openssl/stack.h ../include/openssl/symhacks.h ssl_mcnf.o: ../include/openssl/tls1.h ../include/openssl/x509.h ssl_mcnf.o: ../include/openssl/x509_vfy.h packet_locl.h record/record.h ssl_mcnf.o: ssl_locl.h ssl_mcnf.c statem/statem.h -ssl_rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_rsa.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_rsa.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_rsa.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_rsa.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_rsa.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -587,7 +609,8 @@ ssl_rsa.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssl_rsa.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssl_rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_rsa.o: packet_locl.h record/record.h ssl_locl.h ssl_rsa.c statem/statem.h -ssl_sess.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_sess.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_sess.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_sess.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_sess.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_sess.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -607,7 +630,8 @@ ssl_sess.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssl_sess.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssl_sess.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_sess.o: packet_locl.h record/record.h ssl_locl.h ssl_sess.c statem/statem.h -ssl_stat.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_stat.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_stat.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_stat.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_stat.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_stat.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -626,7 +650,8 @@ ssl_stat.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssl_stat.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssl_stat.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_stat.o: packet_locl.h record/record.h ssl_locl.h ssl_stat.c statem/statem.h -ssl_txt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_txt.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_txt.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_txt.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_txt.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_txt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -645,7 +670,8 @@ ssl_txt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssl_txt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssl_txt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_txt.o: packet_locl.h record/record.h ssl_locl.h ssl_txt.c statem/statem.h -ssl_utst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +ssl_utst.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +ssl_utst.o: ../include/openssl/asn1.h ../include/openssl/async.h ssl_utst.o: ../include/openssl/bio.h ../include/openssl/bn.h ssl_utst.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_utst.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -664,28 +690,31 @@ ssl_utst.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssl_utst.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssl_utst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_utst.o: packet_locl.h record/record.h ssl_locl.h ssl_utst.c statem/statem.h -statem/statem.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h -statem/statem.o: ../include/openssl/bio.h ../include/openssl/bn.h -statem/statem.o: ../include/openssl/buffer.h ../include/openssl/comp.h -statem/statem.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -statem/statem.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -statem/statem.o: ../include/openssl/ec.h ../include/openssl/err.h -statem/statem.o: ../include/openssl/evp.h ../include/openssl/hmac.h -statem/statem.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -statem/statem.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -statem/statem.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -statem/statem.o: ../include/openssl/pem.h ../include/openssl/pem2.h -statem/statem.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -statem/statem.o: ../include/openssl/rand.h ../include/openssl/rsa.h -statem/statem.o: ../include/openssl/safestack.h ../include/openssl/sha.h -statem/statem.o: ../include/openssl/srtp.h ../include/openssl/ssl.h -statem/statem.o: ../include/openssl/ssl2.h ../include/openssl/ssl3.h -statem/statem.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -statem/statem.o: ../include/openssl/tls1.h ../include/openssl/x509.h -statem/statem.o: ../include/openssl/x509_vfy.h statem/../packet_locl.h -statem/statem.o: statem/../record/record.h statem/../ssl_locl.h -statem/statem.o: statem/../statem/statem.h statem/statem.c statem/statem_locl.h -statem/statem_clnt.o: ../e_os.h ../include/openssl/asn1.h +statem/statem.o: ../e_os.h ../include/internal/dane.h +statem/statem.o: ../include/internal/numbers.h ../include/openssl/asn1.h +statem/statem.o: ../include/openssl/async.h ../include/openssl/bio.h +statem/statem.o: ../include/openssl/bn.h ../include/openssl/buffer.h +statem/statem.o: ../include/openssl/comp.h ../include/openssl/crypto.h +statem/statem.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h +statem/statem.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +statem/statem.o: ../include/openssl/err.h ../include/openssl/evp.h +statem/statem.o: ../include/openssl/hmac.h ../include/openssl/lhash.h +statem/statem.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +statem/statem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +statem/statem.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +statem/statem.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +statem/statem.o: ../include/openssl/pqueue.h ../include/openssl/rand.h +statem/statem.o: ../include/openssl/rsa.h ../include/openssl/safestack.h +statem/statem.o: ../include/openssl/sha.h ../include/openssl/srtp.h +statem/statem.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h +statem/statem.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +statem/statem.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +statem/statem.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +statem/statem.o: statem/../packet_locl.h statem/../record/record.h +statem/statem.o: statem/../ssl_locl.h statem/../statem/statem.h statem/statem.c +statem/statem.o: statem/statem_locl.h +statem/statem_clnt.o: ../e_os.h ../include/internal/dane.h +statem/statem_clnt.o: ../include/internal/numbers.h ../include/openssl/asn1.h statem/statem_clnt.o: ../include/openssl/async.h ../include/openssl/bio.h statem/statem_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h statem/statem_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -710,7 +739,8 @@ statem/statem_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h statem/statem_clnt.o: statem/../packet_locl.h statem/../record/record.h statem/statem_clnt.o: statem/../ssl_locl.h statem/../statem/statem.h statem/statem_clnt.o: statem/statem_clnt.c statem/statem_locl.h -statem/statem_dtls.o: ../e_os.h ../include/openssl/asn1.h +statem/statem_dtls.o: ../e_os.h ../include/internal/dane.h +statem/statem_dtls.o: ../include/internal/numbers.h ../include/openssl/asn1.h statem/statem_dtls.o: ../include/openssl/async.h ../include/openssl/bio.h statem/statem_dtls.o: ../include/openssl/bn.h ../include/openssl/buffer.h statem/statem_dtls.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -733,7 +763,8 @@ statem/statem_dtls.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h statem/statem_dtls.o: statem/../packet_locl.h statem/../record/record.h statem/statem_dtls.o: statem/../ssl_locl.h statem/../statem/statem.h statem/statem_dtls.o: statem/statem_dtls.c statem/statem_locl.h -statem/statem_lib.o: ../e_os.h ../include/openssl/asn1.h +statem/statem_lib.o: ../e_os.h ../include/internal/dane.h +statem/statem_lib.o: ../include/internal/numbers.h ../include/openssl/asn1.h statem/statem_lib.o: ../include/openssl/async.h ../include/openssl/bio.h statem/statem_lib.o: ../include/openssl/bn.h ../include/openssl/buffer.h statem/statem_lib.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -757,6 +788,7 @@ statem/statem_lib.o: statem/../packet_locl.h statem/../record/record.h statem/statem_lib.o: statem/../ssl_locl.h statem/../statem/statem.h statem/statem_lib.o: statem/statem_lib.c statem/statem_locl.h statem/statem_srvr.o: ../e_os.h ../include/internal/constant_time_locl.h +statem/statem_srvr.o: ../include/internal/dane.h ../include/internal/numbers.h statem/statem_srvr.o: ../include/openssl/asn1.h ../include/openssl/async.h statem/statem_srvr.o: ../include/openssl/bio.h ../include/openssl/bn.h statem/statem_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h @@ -781,7 +813,8 @@ statem/statem_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h statem/statem_srvr.o: statem/../packet_locl.h statem/../record/record.h statem/statem_srvr.o: statem/../ssl_locl.h statem/../statem/statem.h statem/statem_srvr.o: statem/statem_locl.h statem/statem_srvr.c -t1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +t1_enc.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +t1_enc.o: ../include/openssl/asn1.h ../include/openssl/async.h t1_enc.o: ../include/openssl/bio.h ../include/openssl/bn.h t1_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h t1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -801,7 +834,8 @@ t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h t1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h t1_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h packet_locl.h t1_enc.o: record/record.h ssl_locl.h statem/statem.h t1_enc.c -t1_ext.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +t1_ext.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +t1_ext.o: ../include/openssl/asn1.h ../include/openssl/async.h t1_ext.o: ../include/openssl/bio.h ../include/openssl/bn.h t1_ext.o: ../include/openssl/buffer.h ../include/openssl/comp.h t1_ext.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -820,7 +854,8 @@ t1_ext.o: ../include/openssl/ssl3.h ../include/openssl/stack.h t1_ext.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h t1_ext.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h packet_locl.h t1_ext.o: record/record.h ssl_locl.h statem/statem.h t1_ext.c -t1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +t1_lib.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +t1_lib.o: ../include/openssl/asn1.h ../include/openssl/async.h t1_lib.o: ../include/openssl/bio.h ../include/openssl/bn.h t1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h t1_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h @@ -842,7 +877,8 @@ t1_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h t1_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h t1_lib.o: ../include/openssl/x509v3.h packet_locl.h record/record.h ssl_locl.h t1_lib.o: statem/statem.h t1_lib.c -t1_reneg.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +t1_reneg.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +t1_reneg.o: ../include/openssl/asn1.h ../include/openssl/async.h t1_reneg.o: ../include/openssl/bio.h ../include/openssl/bn.h t1_reneg.o: ../include/openssl/buffer.h ../include/openssl/comp.h t1_reneg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -861,7 +897,8 @@ t1_reneg.o: ../include/openssl/ssl3.h ../include/openssl/stack.h t1_reneg.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h t1_reneg.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h t1_reneg.o: packet_locl.h record/record.h ssl_locl.h statem/statem.h t1_reneg.c -t1_trce.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +t1_trce.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +t1_trce.o: ../include/openssl/asn1.h ../include/openssl/async.h t1_trce.o: ../include/openssl/bio.h ../include/openssl/bn.h t1_trce.o: ../include/openssl/buffer.h ../include/openssl/comp.h t1_trce.o: ../include/openssl/crypto.h ../include/openssl/dsa.h @@ -880,7 +917,8 @@ t1_trce.o: ../include/openssl/ssl3.h ../include/openssl/stack.h t1_trce.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h t1_trce.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h t1_trce.o: packet_locl.h record/record.h ssl_locl.h statem/statem.h t1_trce.c -tls_srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/async.h +tls_srp.o: ../e_os.h ../include/internal/dane.h ../include/internal/numbers.h +tls_srp.o: ../include/openssl/asn1.h ../include/openssl/async.h tls_srp.o: ../include/openssl/bio.h ../include/openssl/bn.h tls_srp.o: ../include/openssl/buffer.h ../include/openssl/comp.h tls_srp.o: ../include/openssl/crypto.h ../include/openssl/dsa.h diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index a15248d41b..44d0e7fa0f 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -567,7 +567,7 @@ static void load_builtin_compressions(void) SSL_COMP *comp = NULL; COMP_METHOD *method = COMP_zlib(); - MemCheck_off(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); ssl_comp_methods = sk_SSL_COMP_new(sk_comp_cmp); if (COMP_get_type(method) != NID_undef && ssl_comp_methods != NULL) { @@ -580,7 +580,7 @@ static void load_builtin_compressions(void) sk_SSL_COMP_sort(ssl_comp_methods); } } - MemCheck_on(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); } } @@ -1902,10 +1902,10 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) return 0; } - MemCheck_off(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); comp = OPENSSL_malloc(sizeof(*comp)); if (comp == NULL) { - MemCheck_on(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); return (1); } @@ -1915,20 +1915,20 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) load_builtin_compressions(); if (ssl_comp_methods && sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) { OPENSSL_free(comp); - MemCheck_on(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID); return (1); - } else if ((ssl_comp_methods == NULL) + } + if ((ssl_comp_methods == NULL) || !sk_SSL_COMP_push(ssl_comp_methods, comp)) { OPENSSL_free(comp); - MemCheck_on(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); return (1); - } else { - MemCheck_on(); - return (0); } + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE); + return (0); } #endif diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index cfa4179a40..fe47fa67a6 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -86,8 +86,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_DTLS1_ENC), "DTLS1_ENC"}, {ERR_FUNC(SSL_F_DTLS1_GET_HELLO_VERIFY), "DTLS1_GET_HELLO_VERIFY"}, {ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE), "dtls1_get_message"}, - {ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT), - "DTLS1_GET_MESSAGE_FRAGMENT"}, + {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_HANDLE_TIMEOUT), "dtls1_handle_timeout"}, {ERR_FUNC(SSL_F_DTLS1_HEARTBEAT), "dtls1_heartbeat"}, @@ -115,8 +114,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_DTLS1_SEND_SERVER_HELLO), "dtls1_send_server_hello"}, {ERR_FUNC(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE), "dtls1_send_server_key_exchange"}, - {ERR_FUNC(SSL_F_DTLS1_WRITE_APP_DATA_BYTES), - "dtls1_write_app_data_bytes"}, + {ERR_FUNC(SSL_F_DTLS1_WRITE_APP_DATA_BYTES), "dtls1_write_app_data_bytes"}, {ERR_FUNC(SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC), "dtls_construct_change_cipher_spec"}, {ERR_FUNC(SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST), @@ -137,10 +135,8 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_SSL3_CONNECT), "ssl3_connect"}, {ERR_FUNC(SSL_F_SSL3_CTRL), "ssl3_ctrl"}, {ERR_FUNC(SSL_F_SSL3_CTX_CTRL), "ssl3_ctx_ctrl"}, - {ERR_FUNC(SSL_F_SSL3_DIGEST_CACHED_RECORDS), - "ssl3_digest_cached_records"}, - {ERR_FUNC(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC), - "ssl3_do_change_cipher_spec"}, + {ERR_FUNC(SSL_F_SSL3_DIGEST_CACHED_RECORDS), "ssl3_digest_cached_records"}, + {ERR_FUNC(SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC), "ssl3_do_change_cipher_spec"}, {ERR_FUNC(SSL_F_SSL3_ENC), "ssl3_enc"}, {ERR_FUNC(SSL_F_SSL3_FINAL_FINISH_MAC), "ssl3_final_finish_mac"}, {ERR_FUNC(SSL_F_SSL3_GENERATE_KEY_BLOCK), "ssl3_generate_key_block"}, @@ -198,8 +194,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_SSL_ADD_CERT_TO_BUF), "ssl_add_cert_to_buf"}, {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT), "ssl_add_clienthello_renegotiate_ext"}, - {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT), - "ssl_add_clienthello_tlsext"}, + {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT), "ssl_add_clienthello_tlsext"}, {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT), "ssl_add_clienthello_use_srtp_ext"}, {ERR_FUNC(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK), @@ -208,8 +203,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { "SSL_add_file_cert_subjects_to_stack"}, {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT), "ssl_add_serverhello_renegotiate_ext"}, - {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT), - "ssl_add_serverhello_tlsext"}, + {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT), "ssl_add_serverhello_tlsext"}, {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT), "ssl_add_serverhello_use_srtp_ext"}, {ERR_FUNC(SSL_F_SSL_BAD_METHOD), "ssl_bad_method"}, @@ -225,8 +219,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { "ssl_check_serverhello_tlsext"}, {ERR_FUNC(SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG), "ssl_check_srvr_ecc_cert_and_alg"}, - {ERR_FUNC(SSL_F_SSL_CIPHER_PROCESS_RULESTR), - "ssl_cipher_process_rulestr"}, + {ERR_FUNC(SSL_F_SSL_CIPHER_PROCESS_RULESTR), "ssl_cipher_process_rulestr"}, {ERR_FUNC(SSL_F_SSL_CIPHER_STRENGTH_SORT), "ssl_cipher_strength_sort"}, {ERR_FUNC(SSL_F_SSL_CLEAR), "SSL_clear"}, {ERR_FUNC(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD), @@ -313,10 +306,8 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_SSL_SET_PURPOSE), "SSL_set_purpose"}, {ERR_FUNC(SSL_F_SSL_SET_RFD), "SSL_set_rfd"}, {ERR_FUNC(SSL_F_SSL_SET_SESSION), "SSL_set_session"}, - {ERR_FUNC(SSL_F_SSL_SET_SESSION_ID_CONTEXT), - "SSL_set_session_id_context"}, - {ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), - "SSL_set_session_ticket_ext"}, + {ERR_FUNC(SSL_F_SSL_SET_SESSION_ID_CONTEXT), "SSL_set_session_id_context"}, + {ERR_FUNC(SSL_F_SSL_SET_SESSION_TICKET_EXT), "SSL_set_session_ticket_ext"}, {ERR_FUNC(SSL_F_SSL_SET_TRUST), "SSL_set_trust"}, {ERR_FUNC(SSL_F_SSL_SET_WFD), "SSL_set_wfd"}, {ERR_FUNC(SSL_F_SSL_SHUTDOWN), "SSL_shutdown"}, @@ -335,10 +326,8 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY_FILE), "SSL_use_PrivateKey_file"}, {ERR_FUNC(SSL_F_SSL_USE_PSK_IDENTITY_HINT), "SSL_use_psk_identity_hint"}, {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY), "SSL_use_RSAPrivateKey"}, - {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1), - "SSL_use_RSAPrivateKey_ASN1"}, - {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE), - "SSL_use_RSAPrivateKey_file"}, + {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1), "SSL_use_RSAPrivateKey_ASN1"}, + {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE), "SSL_use_RSAPrivateKey_file"}, {ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN), "ssl_verify_cert_chain"}, {ERR_FUNC(SSL_F_SSL_WRITE), "SSL_write"}, {ERR_FUNC(SSL_F_STATE_MACHINE), "STATE_MACHINE"}, @@ -366,8 +355,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { "tls_construct_certificate_request"}, {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE), "tls_construct_client_certificate"}, - {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO), - "tls_construct_client_hello"}, + {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_HELLO), "tls_construct_client_hello"}, {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE), "tls_construct_client_key_exchange"}, {ERR_FUNC(SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY), @@ -378,11 +366,9 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE), "tls_construct_server_certificate"}, {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_DONE), "tls_construct_server_done"}, - {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_HELLO), - "tls_construct_server_hello"}, + {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_HELLO), "tls_construct_server_hello"}, {ERR_FUNC(SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE), "tls_construct_server_key_exchange"}, - {ERR_FUNC(SSL_F_TLS_GET_MESSAGE_BODY), "tls_get_message_body"}, {ERR_FUNC(SSL_F_TLS_GET_MESSAGE_HEADER), "tls_get_message_header"}, {ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO), "tls_post_process_client_hello"}, @@ -410,8 +396,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { "tls_process_server_certificate"}, {ERR_FUNC(SSL_F_TLS_PROCESS_SERVER_DONE), "tls_process_server_done"}, {ERR_FUNC(SSL_F_TLS_PROCESS_SERVER_HELLO), "tls_process_server_hello"}, - {ERR_FUNC(SSL_F_USE_CERTIFICATE_CHAIN_FILE), - "use_certificate_chain_file"}, + {ERR_FUNC(SSL_F_USE_CERTIFICATE_CHAIN_FILE), "use_certificate_chain_file"}, {0, NULL} }; @@ -470,16 +455,14 @@ static ERR_STRING_DATA SSL_str_reasons[] = { {ERR_REASON(SSL_R_BAD_VALUE), "bad value"}, {ERR_REASON(SSL_R_BAD_WRITE_RETRY), "bad write retry"}, {ERR_REASON(SSL_R_BIO_NOT_SET), "bio not set"}, - {ERR_REASON(SSL_R_BLOCK_CIPHER_PAD_IS_WRONG), - "block cipher pad is wrong"}, + {ERR_REASON(SSL_R_BLOCK_CIPHER_PAD_IS_WRONG), "block cipher pad is wrong"}, {ERR_REASON(SSL_R_BN_LIB), "bn lib"}, {ERR_REASON(SSL_R_CA_DN_LENGTH_MISMATCH), "ca dn length mismatch"}, {ERR_REASON(SSL_R_CA_DN_TOO_LONG), "ca dn too long"}, {ERR_REASON(SSL_R_CA_KEY_TOO_SMALL), "ca key too small"}, {ERR_REASON(SSL_R_CA_MD_TOO_WEAK), "ca md too weak"}, {ERR_REASON(SSL_R_CCS_RECEIVED_EARLY), "ccs received early"}, - {ERR_REASON(SSL_R_CERTIFICATE_VERIFY_FAILED), - "certificate verify failed"}, + {ERR_REASON(SSL_R_CERTIFICATE_VERIFY_FAILED), "certificate verify failed"}, {ERR_REASON(SSL_R_CERT_CB_ERROR), "cert cb error"}, {ERR_REASON(SSL_R_CERT_LENGTH_MISMATCH), "cert length mismatch"}, {ERR_REASON(SSL_R_CIPHER_CODE_WRONG_LENGTH), "cipher code wrong length"}, @@ -492,8 +475,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { {ERR_REASON(SSL_R_COMPRESSION_FAILURE), "compression failure"}, {ERR_REASON(SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE), "compression id not within private range"}, - {ERR_REASON(SSL_R_COMPRESSION_LIBRARY_ERROR), - "compression library error"}, + {ERR_REASON(SSL_R_COMPRESSION_LIBRARY_ERROR), "compression library error"}, {ERR_REASON(SSL_R_CONNECTION_TYPE_NOT_SET), "connection type not set"}, {ERR_REASON(SSL_R_CONTEXT_NOT_DANE_ENABLED), "context not dane enabled"}, {ERR_REASON(SSL_R_COOKIE_GEN_CALLBACK_FAILURE), @@ -540,8 +522,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { {ERR_REASON(SSL_R_EE_KEY_TOO_SMALL), "ee key too small"}, {ERR_REASON(SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST), "empty srtp protection profile list"}, - {ERR_REASON(SSL_R_ENCRYPTED_LENGTH_TOO_LONG), - "encrypted length too long"}, + {ERR_REASON(SSL_R_ENCRYPTED_LENGTH_TOO_LONG), "encrypted length too long"}, {ERR_REASON(SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST), "error in received cipher list"}, {ERR_REASON(SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN), @@ -620,14 +601,11 @@ static ERR_STRING_DATA SSL_str_reasons[] = { "no shared sigature algorithms"}, {ERR_REASON(SSL_R_NO_SRTP_PROFILES), "no srtp profiles"}, {ERR_REASON(SSL_R_NO_VERIFY_CALLBACK), "no verify callback"}, - {ERR_REASON(SSL_R_NO_VERIFY_COOKIE_CALLBACK), - "no verify cookie callback"}, + {ERR_REASON(SSL_R_NO_VERIFY_COOKIE_CALLBACK), "no verify cookie callback"}, {ERR_REASON(SSL_R_NULL_SSL_CTX), "null ssl ctx"}, {ERR_REASON(SSL_R_NULL_SSL_METHOD_PASSED), "null ssl method passed"}, {ERR_REASON(SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED), "old session cipher not returned"}, - {ERR_REASON(SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED), - "old session compression algorithm not returned"}, {ERR_REASON(SSL_R_PACKET_LENGTH_TOO_LONG), "packet length too long"}, {ERR_REASON(SSL_R_PARSE_TLSEXT), "parse tlsext"}, {ERR_REASON(SSL_R_PATH_TOO_LONG), "path too long"}, @@ -675,8 +653,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { {ERR_REASON(SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE), "ssl3 ext invalid servername type"}, {ERR_REASON(SSL_R_SSL3_SESSION_ID_TOO_LONG), "ssl3 session id too long"}, - {ERR_REASON(SSL_R_SSL3_SESSION_ID_TOO_SHORT), - "ssl3 session id too short"}, + {ERR_REASON(SSL_R_SSL3_SESSION_ID_TOO_SHORT), "ssl3 session id too short"}, |