diff options
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/Makefile.ssl | 303 | ||||
-rw-r--r-- | ssl/s23_lib.c | 2 | ||||
-rw-r--r-- | ssl/s2_lib.c | 2 | ||||
-rw-r--r-- | ssl/s3_clnt.c | 15 | ||||
-rw-r--r-- | ssl/s3_lib.c | 2 | ||||
-rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
-rw-r--r-- | ssl/ssl.err | 5 | ||||
-rw-r--r-- | ssl/ssl.h | 22 | ||||
-rw-r--r-- | ssl/ssl_asn1.c | 25 | ||||
-rw-r--r-- | ssl/ssl_err.c | 5 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 20 | ||||
-rw-r--r-- | ssl/ssl_sess.c | 28 | ||||
-rw-r--r-- | ssl/ssl_txt.c | 14 | ||||
-rw-r--r-- | ssl/t1_lib.c | 2 |
14 files changed, 273 insertions, 174 deletions
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index ffadc17f30..8dfa3d0a2d 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -105,74 +105,74 @@ bio_ssl.o: ../include/bn.h ../include/buffer.h ../include/cast.h bio_ssl.o: ../include/crypto.h ../include/des.h ../include/dh.h bio_ssl.o: ../include/dsa.h ../include/err.h ../include/evp.h ../include/idea.h bio_ssl.o: ../include/lhash.h ../include/md2.h ../include/md5.h -bio_ssl.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h -bio_ssl.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -bio_ssl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -bio_ssl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -bio_ssl.o: ssl2.h ssl23.h ssl3.h tls1.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 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 s23_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h s23_clnt.o: ../include/evp.h ../include/idea.h ../include/lhash.h s23_clnt.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -s23_clnt.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h -s23_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s23_clnt.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s23_clnt.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s23_clnt.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.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_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 s23_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s23_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s23_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s23_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s23_lib.o: ssl_locl.h tls1.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_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 s23_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s23_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s23_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s23_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s23_meth.o: ssl_locl.h tls1.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_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 s23_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s23_pkt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s23_pkt.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s23_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s23_pkt.o: ssl_locl.h tls1.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_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 s23_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h s23_srvr.o: ../include/evp.h ../include/idea.h ../include/lhash.h s23_srvr.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -s23_srvr.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h -s23_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -s23_srvr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -s23_srvr.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -s23_srvr.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.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 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 s2_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -s2_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -182,52 +182,52 @@ s2_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h s2_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s2_enc.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s2_enc.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s2_enc.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s2_enc.o: ssl_locl.h tls1.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_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 s2_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s2_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s2_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s2_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s2_lib.o: ssl_locl.h tls1.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_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 s2_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s2_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s2_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s2_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s2_meth.o: ssl_locl.h tls1.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_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 s2_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s2_pkt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s2_pkt.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s2_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s2_pkt.o: ssl_locl.h tls1.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_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 s2_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -s2_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -237,8 +237,8 @@ s3_both.o: ../include/comp.h ../include/crypto.h ../include/des.h s3_both.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -s3_both.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -248,8 +248,8 @@ s3_clnt.o: ../include/comp.h ../include/crypto.h ../include/des.h s3_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -s3_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -259,52 +259,52 @@ s3_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h s3_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s3_enc.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s3_enc.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s3_enc.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s3_enc.o: ssl_locl.h tls1.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_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 s3_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s3_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s3_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s3_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s3_lib.o: ssl_locl.h tls1.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_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 s3_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s3_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s3_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s3_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s3_meth.o: ssl_locl.h tls1.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_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 s3_pkt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -s3_pkt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s3_pkt.o: ../include/rsa.h ../include/sha.h ../include/stack.h -s3_pkt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -s3_pkt.o: ssl_locl.h tls1.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_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 s3_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -s3_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -314,127 +314,130 @@ ssl_algs.o: ../include/comp.h ../include/crypto.h ../include/des.h ssl_algs.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -ssl_algs.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_algs.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_algs.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_algs.o: ssl_locl.h tls1.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_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 ssl_asn1.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h ssl_asn1.o: ../include/err.h ../include/evp.h ../include/idea.h ssl_asn1.o: ../include/lhash.h ../include/md2.h ../include/md5.h -ssl_asn1.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h -ssl_asn1.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_asn1.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_asn1.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_asn1.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.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_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 ssl_cert.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h ssl_cert.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_cert.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -ssl_cert.o: ../include/objects.h ../include/pem.h ../include/pem2.h -ssl_cert.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -ssl_cert.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ssl_cert.o: ../include/sha.h ../include/stack.h ../include/x509.h -ssl_cert.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.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_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 ssl_ciph.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -ssl_ciph.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_ciph.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_ciph.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_ciph.o: ssl_locl.h tls1.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_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 ssl_err.o: ../include/dsa.h ../include/err.h ../include/evp.h ../include/idea.h ssl_err.o: ../include/lhash.h ../include/md2.h ../include/md5.h -ssl_err.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h -ssl_err.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_err.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_err.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_err.o: ssl2.h ssl23.h ssl3.h tls1.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_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 ssl_err2.o: ../include/dsa.h ../include/err.h ../include/evp.h 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/pkcs7.h ../include/rc2.h ../include/rc4.h -ssl_err2.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ssl_err2.o: ../include/sha.h ../include/stack.h ../include/x509.h -ssl_err2.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h tls1.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_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 ssl_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -ssl_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_lib.o: ssl_locl.h tls1.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_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 ssl_rsa.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h ssl_rsa.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_rsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -ssl_rsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h -ssl_rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -ssl_rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ssl_rsa.o: ../include/sha.h ../include/stack.h ../include/x509.h -ssl_rsa.o: ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.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_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 ssl_sess.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h ssl_sess.o: ../include/evp.h ../include/idea.h ../include/lhash.h ssl_sess.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -ssl_sess.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h -ssl_sess.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -ssl_sess.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -ssl_sess.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ssl.h -ssl_sess.o: ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.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_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 ssl_stat.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -ssl_stat.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_stat.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_stat.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_stat.o: ssl_locl.h tls1.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_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 ssl_txt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -ssl_txt.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -ssl_txt.o: ../include/rsa.h ../include/sha.h ../include/stack.h -ssl_txt.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -ssl_txt.o: ssl_locl.h tls1.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 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 t1_clnt.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -t1_clnt.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -444,8 +447,8 @@ t1_enc.o: ../include/comp.h ../include/crypto.h ../include/des.h t1_enc.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h -t1_enc.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 @@ -455,30 +458,30 @@ t1_lib.o: ../include/comp.h ../include/crypto.h ../include/des.h t1_lib.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -t1_lib.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -t1_lib.o: ../include/rsa.h ../include/sha.h ../include/stack.h -t1_lib.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -t1_lib.o: ssl_locl.h tls1.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_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 t1_meth.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rc2.h -t1_meth.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -t1_meth.o: ../include/rsa.h ../include/sha.h ../include/stack.h -t1_meth.o: ../include/x509.h ../include/x509_vfy.h ssl.h ssl2.h ssl23.h ssl3.h -t1_meth.o: ssl_locl.h tls1.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_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 t1_srvr.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h 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/pkcs7.h ../include/rand.h -t1_srvr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.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 diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index 24b884ff4c..34aa0de4fd 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c @@ -78,7 +78,7 @@ static int ssl23_put_cipher_by_char(); static SSL_CIPHER *ssl23_get_cipher_by_char(); #endif -char *SSL23_version_str="SSLv2/3 compatibility part of OpenSSL 0.9.2 31-Dec-1998"; +char *SSL23_version_str="SSLv2/3 compatibility" OPENSSL_VERSION_PTEXT; static SSL_METHOD SSLv23_data= { TLS1_VERSION, diff --git a/ssl/s2_lib.c b/ssl/s2_lib.c index df24775568..e7581313c9 100644 --- a/ssl/s2_lib.c +++ b/ssl/s2_lib.c @@ -67,7 +67,7 @@ static long ssl2_default_timeout(void ); static long ssl2_default_timeout(); #endif -char *ssl2_version_str="SSLv2 part of OpenSSL 0.9.2 31-Dec-1998"; +char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT; #define SSL2_NUM_CIPHERS (sizeof(ssl2_ciphers)/sizeof(SSL_CIPHER)) diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index cb63a9f7ce..5cc0ff446d 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -605,9 +605,18 @@ SSL *s; goto f_err; } } - if ((j != 0) && (j == s->session->session_id_length) && - (memcmp(p,s->session->session_id,j) == 0)) - s->hit=1; + if (j != 0 && j == s->session->session_id_length + && memcmp(p,s->session->session_id,j) == 0) + { + if(s->sid_ctx_length != s->session->sid_ctx_length + || memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length)) + { + al=SSL_AD_ILLEGAL_PARAMETER; + SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT); + goto f_err; + } + s->hit=1; + } else /* a miss or crap from the other end */ { /* If we were trying for session-id reuse, make a new diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 78afd87ced..0fba6ce0ba 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -60,7 +60,7 @@ #include "objects.h" #include "ssl_locl.h" -char *ssl3_version_str="SSLv3 part of OpenSSL 0.9.2 31-Dec-1998"; +char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT; #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER)) diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 56d8dd4737..21b93c1ba4 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -1683,6 +1683,8 @@ SSL *s; if (s->session->peer != NULL) X509_free(s->session->peer); s->session->peer=(X509 *)sk_shift(sk); + s->session->cert->cert_chain=sk; + sk=NULL; ret=1; if (0) diff --git a/ssl/ssl.err b/ssl/ssl.err index 413124f7f5..e2677d7755 100644 --- a/ssl/ssl.err +++ b/ssl/ssl.err @@ -86,6 +86,7 @@ #define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE 179 #define SSL_F_SSL_DO_HANDSHAKE 180 #define SSL_F_SSL_GET_NEW_SESSION 181 +#define SSL_F_SSL_GET_PREV_SESSION 217 #define SSL_F_SSL_GET_SERVER_SEND_CERT 182 #define SSL_F_SSL_GET_SIGN_PKEY 183 #define SSL_F_SSL_INIT_WBIO_BUFFER 184 @@ -100,6 +101,7 @@ #define SSL_F_SSL_SET_PKEY 193 #define SSL_F_SSL_SET_RFD 194 #define SSL_F_SSL_SET_SESSION 195 +#define SSL_F_SSL_SET_SESSION_ID_CONTEXT 218 #define SSL_F_SSL_SET_WFD 196 #define SSL_F_SSL_UNDEFINED_FUNCTION 197 #define SSL_F_SSL_USE_CERTIFICATE 198 @@ -120,6 +122,7 @@ /* Reason codes. */ #define SSL_R_APP_DATA_IN_HANDSHAKE 100 +#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272 #define SSL_R_BAD_ALERT_RECORD 101 |