diff options
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/Makefile.ssl | 204 | ||||
-rw-r--r-- | ssl/s23_srvr.c | 6 | ||||
-rw-r--r-- | ssl/s2_clnt.c | 22 | ||||
-rw-r--r-- | ssl/s2_srvr.c | 18 | ||||
-rw-r--r-- | ssl/s3_both.c | 4 | ||||
-rw-r--r-- | ssl/s3_clnt.c | 28 | ||||
-rw-r--r-- | ssl/s3_lib.c | 21 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 46 | ||||
-rw-r--r-- | ssl/ssl.h | 38 | ||||
-rw-r--r-- | ssl/ssl3.h | 2 | ||||
-rw-r--r-- | ssl/ssl_cert.c | 45 | ||||
-rw-r--r-- | ssl/ssl_ciph.c | 41 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 88 | ||||
-rw-r--r-- | ssl/ssl_locl.h | 24 | ||||
-rw-r--r-- | ssl/ssl_sess.c | 2 |
15 files changed, 308 insertions, 281 deletions
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index 8f18f7fe02..0a499ffbbc 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -108,8 +108,9 @@ bio_ssl.o: ../include/lhash.h ../include/md2.h ../include/md5.h bio_ssl.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h bio_ssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h bio_ssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -bio_ssl.o: ../include/sha.h ../include/stack.h ../include/x509.h -bio_ssl.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h +bio_ssl.o: ../include/safestack.h ../include/sha.h ../include/stack.h +bio_ssl.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h +bio_ssl.o: tls1.h s23_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s23_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h s23_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -119,8 +120,9 @@ s23_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s23_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s23_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h s23_clnt.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -s23_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h -s23_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s23_clnt.o: ../include/safestack.h ../include/sha.h ../include/stack.h +s23_clnt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h +s23_clnt.o: ssl_locl.h tls1.h s23_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s23_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h s23_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -129,9 +131,9 @@ s23_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h s23_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s23_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s23_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s23_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s23_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s23_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s23_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s23_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h +s23_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s23_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s23_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h s23_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -140,9 +142,9 @@ s23_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h s23_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s23_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s23_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s23_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s23_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s23_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s23_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s23_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h +s23_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s23_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s23_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h s23_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -151,9 +153,9 @@ s23_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h s23_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s23_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s23_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s23_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s23_pkt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s23_pkt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s23_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s23_pkt.o: ../include/sha.h ../include/stack.h ../include/x509.h +s23_pkt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s23_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s23_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h s23_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -163,8 +165,9 @@ s23_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s23_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s23_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h s23_srvr.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -s23_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h -s23_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s23_srvr.o: ../include/safestack.h ../include/sha.h ../include/stack.h +s23_srvr.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h +s23_srvr.o: ssl_locl.h tls1.h s2_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s2_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h s2_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -173,9 +176,9 @@ s2_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h s2_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s2_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s2_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -s2_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s2_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s2_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s2_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s2_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h +s2_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s2_enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s2_enc.o: ../include/bn.h ../include/buffer.h ../include/cast.h s2_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -184,9 +187,9 @@ s2_enc.o: ../include/evp.h ../include/idea.h ../include/lhash.h s2_enc.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s2_enc.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s2_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s2_enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s2_enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s2_enc.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s2_enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s2_enc.o: ../include/sha.h ../include/stack.h ../include/x509.h +s2_enc.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s2_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s2_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h s2_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -195,9 +198,9 @@ s2_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h s2_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s2_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s2_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s2_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s2_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s2_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s2_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s2_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h +s2_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s2_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s2_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h s2_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -206,9 +209,9 @@ s2_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h s2_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s2_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s2_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s2_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s2_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s2_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s2_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s2_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h +s2_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s2_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s2_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h s2_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -217,9 +220,9 @@ s2_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h s2_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s2_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s2_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s2_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s2_pkt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s2_pkt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s2_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s2_pkt.o: ../include/sha.h ../include/stack.h ../include/x509.h +s2_pkt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s2_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s2_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h s2_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -228,9 +231,9 @@ s2_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h s2_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s2_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s2_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -s2_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s2_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s2_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s2_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s2_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h +s2_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_both.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_both.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_both.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -239,9 +242,9 @@ s3_both.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_both.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_both.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_both.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_both.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_both.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_both.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_both.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_both.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_both.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -250,9 +253,9 @@ s3_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_enc.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -261,9 +264,9 @@ s3_enc.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_enc.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_enc.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_enc.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_enc.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_enc.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -272,9 +275,9 @@ s3_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -283,9 +286,9 @@ s3_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_pkt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_pkt.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_pkt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -294,9 +297,9 @@ s3_pkt.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_pkt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_pkt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_pkt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_pkt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_pkt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_pkt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_pkt.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_pkt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h s3_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s3_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h s3_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -305,9 +308,9 @@ s3_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h s3_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h s3_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h s3_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -s3_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s3_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s3_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +s3_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +s3_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h +s3_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_algs.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_algs.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_algs.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -316,9 +319,9 @@ ssl_algs.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_algs.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_algs.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h ssl_algs.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_algs.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_algs.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_algs.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_algs.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +ssl_algs.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_algs.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_asn1.o: ../include/asn1.h ../include/asn1_mac.h ../include/bio.h ssl_asn1.o: ../include/blowfish.h ../include/bn.h ../include/buffer.h ssl_asn1.o: ../include/cast.h ../include/comp.h ../include/crypto.h @@ -328,8 +331,9 @@ ssl_asn1.o: ../include/lhash.h ../include/md2.h ../include/md5.h ssl_asn1.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h ssl_asn1.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ssl_asn1.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ssl_asn1.o: ../include/sha.h ../include/stack.h ../include/x509.h -ssl_asn1.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_asn1.o: ../include/safestack.h ../include/sha.h ../include/stack.h +ssl_asn1.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h +ssl_asn1.o: ssl_locl.h tls1.h ssl_cert.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_cert.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_cert.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -339,9 +343,9 @@ ssl_cert.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_cert.o: ../include/objects.h ../include/opensslv.h ../include/pem.h ssl_cert.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ssl_cert.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_cert.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_cert.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_cert.o: ssl_locl.h tls1.h +ssl_cert.o: ../include/rsa.h ../include/safestack.h ../include/sha.h +ssl_cert.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h +ssl_cert.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_ciph.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_ciph.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_ciph.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -350,9 +354,9 @@ ssl_ciph.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_ciph.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_ciph.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h ssl_ciph.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_ciph.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_ciph.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_ciph.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_ciph.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +ssl_ciph.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_ciph.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_err.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_err.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_err.o: ../include/crypto.h ../include/des.h ../include/dh.h @@ -361,8 +365,9 @@ ssl_err.o: ../include/lhash.h ../include/md2.h ../include/md5.h ssl_err.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h ssl_err.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ssl_err.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ssl_err.o: ../include/sha.h ../include/stack.h ../include/x509.h -ssl_err.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h +ssl_err.o: ../include/safestack.h ../include/sha.h ../include/stack.h +ssl_err.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h +ssl_err.o: tls1.h ssl_err2.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_err2.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_err2.o: ../include/crypto.h ../include/des.h ../include/dh.h @@ -371,9 +376,9 @@ ssl_err2.o: ../include/idea.h ../include/lhash.h ../include/md2.h ssl_err2.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ssl_err2.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h ssl_err2.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_err2.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_err2.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_err2.o: tls1.h +ssl_err2.o: ../include/rsa.h ../include/safestack.h ../include/sha.h +ssl_err2.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h +ssl_err2.o: ssl2.h ssl23.h ssl3.h tls1.h ssl_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -382,9 +387,9 @@ ssl_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h ssl_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +ssl_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_rsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_rsa.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -394,9 +399,9 @@ ssl_rsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_rsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h ssl_rsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ssl_rsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_rsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_rsa.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_rsa.o: ssl_locl.h tls1.h +ssl_rsa.o: ../include/rsa.h ../include/safestack.h ../include/sha.h +ssl_rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h +ssl_rsa.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_sess.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_sess.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_sess.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -406,8 +411,9 @@ ssl_sess.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_sess.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h ssl_sess.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ssl_sess.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ssl_sess.o: ../include/sha.h ../include/stack.h ../include/x509.h -ssl_sess.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_sess.o: ../include/safestack.h ../include/sha.h ../include/stack.h +ssl_sess.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h +ssl_sess.o: ssl_locl.h tls1.h ssl_stat.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_stat.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_stat.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -416,9 +422,9 @@ ssl_stat.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_stat.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_stat.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h ssl_stat.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_stat.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_stat.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_stat.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_stat.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +ssl_stat.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_stat.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h ssl_txt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ssl_txt.o: ../include/bn.h ../include/buffer.h ../include/cast.h ssl_txt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -427,9 +433,9 @@ ssl_txt.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_txt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h ssl_txt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h ssl_txt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_txt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_txt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_txt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +ssl_txt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +ssl_txt.o: ../include/sha.h ../include/stack.h ../include/x509.h +ssl_txt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h t1_clnt.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h t1_clnt.o: ../include/bn.h ../include/buffer.h ../include/cast.h t1_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -438,9 +444,9 @@ t1_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h t1_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h t1_clnt.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h t1_clnt.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -t1_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -t1_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -t1_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +t1_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +t1_clnt.o: ../include/sha.h ../include/stack.h ../include/x509.h +t1_clnt.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h t1_enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h t1_enc.o: ../include/bn.h ../include/buffer.h ../include/cast.h t1_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -449,9 +455,9 @@ t1_enc.o: ../include/evp.h ../include/hmac.h ../include/idea.h t1_enc.o: ../include/lhash.h ../include/md2.h ../include/md5.h t1_enc.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h t1_enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -t1_enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -t1_enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -t1_enc.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +t1_enc.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +t1_enc.o: ../include/sha.h ../include/stack.h ../include/x509.h +t1_enc.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h t1_lib.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h t1_lib.o: ../include/bn.h ../include/buffer.h ../include/cast.h t1_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -460,9 +466,9 @@ t1_lib.o: ../include/evp.h ../include/idea.h ../include/lhash.h t1_lib.o: ../include/md2.h ../include/md5.h ../include/mdc2.h t1_lib.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h t1_lib.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -t1_lib.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -t1_lib.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -t1_lib.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +t1_lib.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +t1_lib.o: ../include/sha.h ../include/stack.h ../include/x509.h +t1_lib.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h t1_meth.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h t1_meth.o: ../include/bn.h ../include/buffer.h ../include/cast.h t1_meth.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -471,9 +477,9 @@ t1_meth.o: ../include/evp.h ../include/idea.h ../include/lhash.h t1_meth.o: ../include/md2.h ../include/md5.h ../include/mdc2.h t1_meth.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h t1_meth.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -t1_meth.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -t1_meth.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -t1_meth.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +t1_meth.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +t1_meth.o: ../include/sha.h ../include/stack.h ../include/x509.h +t1_meth.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h t1_srvr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h t1_srvr.o: ../include/bn.h ../include/buffer.h ../include/cast.h t1_srvr.o: ../include/comp.h ../include/crypto.h ../include/des.h @@ -482,6 +488,6 @@ t1_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h t1_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h t1_srvr.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h t1_srvr.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -t1_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -t1_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -t1_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +t1_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/safestack.h +t1_srvr.o: ../include/sha.h ../include/stack.h ../include/x509.h +t1_srvr.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c index bf5e112754..fa132166bd 100644 --- a/ssl/s23_srvr.c +++ b/ssl/s23_srvr.c @@ -256,7 +256,7 @@ SSL *s; if (s->options & SSL_OP_NON_EXPORT_FIRST) { - STACK *sk; + STACK_OF(SSL_CIPHER) *sk; SSL_CIPHER *c; int ne2,ne3; @@ -287,9 +287,9 @@ SSL *s; if (sk != NULL) { ne2=ne3=0; - for (j=0; j<sk_num(sk); j++) + for (j=0; j<sk_SSL_CIPHER_num(sk); j++) { - c=(SSL_CIPHER *)sk_value(sk,j); + c=sk_SSL_CIPHER_value(sk,j); if (!SSL_C_IS_EXPORT(c)) { if ((c->id>>24L) == 2L) diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index d5457b0328..46e14d82cd 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -302,7 +302,7 @@ SSL *s; unsigned char *buf; unsigned char *p; int i,j; - STACK *sk=NULL,*cl; + STACK_OF(SSL_CIPHER) *sk=NULL,*cl; buf=(unsigned char *)s->init_buf->data; p=buf; @@ -411,7 +411,7 @@ SSL *s; /* load the ciphers */ sk=ssl_bytes_to_cipher_list(s,p,s->s2->tmp.csl, - &s->session->ciphers); + &s->session->ciphers); p+=s->s2->tmp.csl; if (sk == NULL) { @@ -420,7 +420,7 @@ SSL *s; return(-1); } - sk_set_cmp_func(sk,ssl_cipher_ptr_id_cmp); + sk_SSL_CIPHER_set_cmp_func(sk,ssl_cipher_ptr_id_cmp); /* get the array of ciphers we will accept */ cl=ssl_get_ciphers_by_id(s); @@ -430,19 +430,20 @@ SSL *s; * will check against the list we origionally sent and * for performance reasons we should not bother to match * the two lists up just to check. */ - for (i=0; i<sk_num(cl); i++) + for (i=0; i<sk_SSL_CIPHER_num(cl); i++) { - if (sk_find(sk,sk_value(cl,i)) >= 0) + if (sk_SSL_CIPHER_find(sk, + sk_SSL_CIPHER_value(cl,i)) >= 0) break; } - if (i >= sk_num(cl)) + if (i >= sk_SSL_CIPHER_num(cl)) { ssl2_return_error(s,SSL2_PE_NO_CIPHER); SSLerr(SSL_F_GET_SERVER_HELLO,SSL_R_NO_CIPHER_MATCH); return(-1); } - s->session->cipher=(SSL_CIPHER *)sk_value(cl,i); + s->session->cipher=sk_SSL_CIPHER_value(cl,i); } if ((s->session != NULL) && (s->session->peer != NULL)) @@ -894,7 +895,7 @@ int type; int len; unsigned char *data; { - STACK *sk=NULL; + STACK_OF(X509) *sk=NULL; EVP_PKEY *pkey=NULL; CERT *c=NULL; int i; @@ -908,8 +909,7 @@ unsigned char *data; goto err; } - if (((sk=sk_new_null()) == NULL) || - (!sk_push(sk,(char *)x509))) + if ((sk=sk_X509_new_null()) == NULL || !sk_X509_push(sk,x509)) { SSLerr(SSL_F_SSL2_SET_CERTIFICATE,ERR_R_MALLOC_FAILURE); goto err; @@ -957,7 +957,7 @@ unsigned char *data; goto err; ret=1; err: - sk_free(sk); + sk_X509_free(sk); X509_free(x509); EVP_PKEY_free(pkey); return(ret); diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index 73c19af807..930a47d4d3 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -465,8 +465,8 @@ SSL *s; { int i,n; unsigned char *p; - STACK *cs; /* a stack of SSL_CIPHERS */ - STACK *cl; /* the ones we want to use */ + STACK_OF(SSL_CIPHER) *cs; /* a stack of SSL_CIPHERS */ + STACK_OF(SSL_CIPHER) *cl; /* the ones we want to use */ int z; /* This is a bit of a hack to check for the correct packet @@ -574,11 +574,11 @@ SSL *s; cl=ssl_get_ciphers_by_id(s); - for (z=0; z<sk_num(cs); z++) + for (z=0; z<sk_SSL_CIPHER_num(cs); z++) { - if (sk_find(cl,sk_value(cs,z)) < 0) + if (sk_SSL_CIPHER_find(cl,sk_SSL_CIPHER_value(cs,z)) < 0) { - sk_delete(cs,z); + sk_SSL_CIPHER_delete(cs,z); z--; } } @@ -608,7 +608,7 @@ SSL *s; { unsigned char *p,*d; int n,hit; - STACK *sk; + STACK_OF(SSL_CIPHER) *sk; p=(unsigned char *)s->init_buf->data; if (s->state == SSL2_ST_SEND_SERVER_HELLO_A) @@ -787,7 +787,7 @@ SSL *s; unsigned char *ccd; int i,j,ctype,ret= -1; X509 *x509=NULL; - STACK *sk=NULL; + STACK_OF(X509) *sk=NULL; ccd=s->s2->tmp.ccl; if (s->state == SSL2_ST_SEND_REQUEST_CERTIFICATE_A) @@ -876,7 +876,7 @@ SSL *s; goto msg_end; } - if (((sk=sk_new_null()) == NULL) || (!sk_push(sk,(char *)x509))) + if (((sk=sk_X509_new_null()) == NULL) || (!sk_X509_push(sk,x509))) { SSLerr(SSL_F_REQUEST_CERTIFICATE,ERR_R_MALLOC_FAILURE); goto msg_end; @@ -933,7 +933,7 @@ msg_end: ssl2_return_error(s,SSL2_PE_BAD_CERTIFICATE); } end: - sk_free(sk); + sk_X509_free(sk); X509_free(x509); return(ret); } diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 0dad8919c7..c3d660ff33 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -245,9 +245,9 @@ X509 *x; /* Thawte special :-) */ if (s->ctx->extra_certs != NULL) - for (i=0; i<sk_num(s->ctx->extra_certs); i++) + for (i=0; i<sk_X509_num(s->ctx->extra_certs); i++) { - x=(X509 *)sk_value(s->ctx->extra_certs,i); + x=sk_X509_value(s->ctx->extra_certs,i); n=i2d_X509(x,NULL); if (!BUF_MEM_grow(buf,(int)(n+l+3))) { diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 5cc0ff446d..24d4f14e93 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -531,11 +531,11 @@ SSL *s; if (s->ctx->comp_methods == NULL) j=0; else - j=sk_num(s->ctx->comp_methods); + j=sk_SSL_COMP_num(s->ctx->comp_methods); *(p++)=1+j; for (i=0; i<j; i++) { - comp=(S |