diff options
author | Ben Laurie <ben@openssl.org> | 1999-03-22 12:22:14 +0000 |
---|---|---|
committer | Ben Laurie <ben@openssl.org> | 1999-03-22 12:22:14 +0000 |
commit | b4cadc6e1343c01b06613053a90ed2ee85e65090 (patch) | |
tree | 5670424b0d897cd7f8161e321f0f514131265159 /apps | |
parent | 0f423567a72b68b617ad5554e51095f1017a9d7b (diff) | |
download | openssl-b4cadc6e1343c01b06613053a90ed2ee85e65090.tar.gz |
Fix security hole.
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile.ssl | 281 | ||||
-rw-r--r-- | apps/s_apps.h | 2 | ||||
-rw-r--r-- | apps/s_server.c | 27 | ||||
-rw-r--r-- | apps/s_socket.c | 5 | ||||
-rw-r--r-- | apps/sess_id.c | 19 |
5 files changed, 187 insertions, 147 deletions
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index 8aa5c8db99..f9b16d7511 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -138,37 +138,38 @@ progs.h: # DO NOT DELETE THIS LINE -- make depend depends on it. apps.o: ../include/bio.h ../include/buffer.h ../include/crypto.h -apps.o: ../include/e_os.h ../include/stack.h apps.h progs.h +apps.o: ../include/e_os.h ../include/opensslv.h ../include/stack.h apps.h +apps.o: progs.h asn1pars.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h asn1pars.o: ../include/bn.h ../include/buffer.h ../include/cast.h asn1pars.o: ../include/crypto.h ../include/des.h ../include/dh.h asn1pars.o: ../include/dsa.h ../include/e_os.h ../include/err.h asn1pars.o: ../include/evp.h ../include/idea.h ../include/md2.h asn1pars.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -asn1pars.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h -asn1pars.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -asn1pars.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -asn1pars.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -asn1pars.o: progs.h +asn1pars.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +asn1pars.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +asn1pars.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +asn1pars.o: ../include/sha.h ../include/stack.h ../include/x509.h +asn1pars.o: ../include/x509_vfy.h apps.h progs.h ca.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h ca.o: ../include/buffer.h ../include/cast.h ../include/conf.h ca.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h ca.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h ca.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h -ca.o: ../include/objects.h ../include/pem.h ../include/pem2.h -ca.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -ca.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h -ca.o: ../include/txt_db.h ../include/x509.h ../include/x509_vfy.h -ca.o: ../include/x509v3.h apps.h progs.h +ca.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +ca.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +ca.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h +ca.o: ../include/stack.h ../include/txt_db.h ../include/x509.h +ca.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h ciphers.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ciphers.o: ../include/bn.h ../include/buffer.h ../include/cast.h ciphers.o: ../include/crypto.h ../include/des.h ../include/dh.h ciphers.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h ciphers.o: ../include/idea.h ../include/lhash.h ../include/md2.h ciphers.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -ciphers.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -ciphers.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -ciphers.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h +ciphers.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h +ciphers.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +ciphers.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h ciphers.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h ciphers.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h ciphers.o: progs.h @@ -176,75 +177,77 @@ crl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h crl.o: ../include/buffer.h ../include/cast.h ../include/crypto.h crl.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h crl.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h -crl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -crl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -crl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -crl.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h -crl.o: ../include/x509v3.h apps.h progs.h +crl.o: ../include/md5.h ../include/mdc2.h ../include/objects.h +crl.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +crl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +crl.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h +crl.o: ../include/x509.h ../include/x509_vfy.h ../include/x509v3.h apps.h +crl.o: progs.h crl2p7.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h crl2p7.o: ../include/bn.h ../include/buffer.h ../include/cast.h crl2p7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h crl2p7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h crl2p7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -crl2p7.o: ../include/objects.h ../include/pem.h ../include/pem2.h -crl2p7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -crl2p7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -crl2p7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -crl2p7.o: progs.h +crl2p7.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +crl2p7.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h +crl2p7.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +crl2p7.o: ../include/rsa.h ../include/sha.h ../include/stack.h +crl2p7.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h dgst.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h dgst.o: ../include/bn.h ../include/buffer.h ../include/cast.h dgst.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h dgst.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h dgst.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -dgst.o: ../include/objects.h ../include/pem.h ../include/pem2.h -dgst.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -dgst.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +dgst.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +dgst.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +dgst.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h dgst.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h dgst.o: progs.h dh.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h dh.o: ../include/buffer.h ../include/cast.h ../include/crypto.h dh.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h dh.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h -dh.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -dh.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -dh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -dh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h progs.h +dh.o: ../include/md5.h ../include/mdc2.h ../include/objects.h +dh.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +dh.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +dh.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h +dh.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h dsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h dsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h dsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h dsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h -dsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -dsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -dsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -dsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -dsa.o: progs.h +dsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h +dsa.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +dsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +dsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h +dsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h dsaparam.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h dsaparam.o: ../include/bn.h ../include/buffer.h ../include/cast.h dsaparam.o: ../include/crypto.h ../include/des.h ../include/dh.h dsaparam.o: ../include/dsa.h ../include/e_os.h ../include/err.h dsaparam.o: ../include/evp.h ../include/idea.h ../include/md2.h dsaparam.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -dsaparam.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h -dsaparam.o: ../include/rand.h ../include/rc2.h ../include/rc4.h -dsaparam.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -dsaparam.o: ../include/sha.h ../include/stack.h ../include/x509.h -dsaparam.o: ../include/x509_vfy.h apps.h progs.h +dsaparam.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +dsaparam.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h +dsaparam.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +dsaparam.o: ../include/rsa.h ../include/sha.h ../include/stack.h +dsaparam.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h enc.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h enc.o: ../include/buffer.h ../include/cast.h ../include/crypto.h enc.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h enc.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h -enc.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -enc.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -enc.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -enc.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -enc.o: progs.h +enc.o: ../include/md5.h ../include/mdc2.h ../include/objects.h +enc.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +enc.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +enc.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h +enc.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h errstr.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h errstr.o: ../include/bn.h ../include/buffer.h ../include/cast.h errstr.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h errstr.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h errstr.o: ../include/lhash.h ../include/md2.h ../include/md5.h -errstr.o: ../include/mdc2.h ../include/objects.h ../include/pkcs7.h -errstr.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +errstr.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h +errstr.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h errstr.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h errstr.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h errstr.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h @@ -254,39 +257,41 @@ gendh.o: ../include/bn.h ../include/buffer.h ../include/cast.h gendh.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h gendh.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h gendh.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -gendh.o: ../include/objects.h ../include/pem.h ../include/pem2.h -gendh.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h -gendh.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -gendh.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -gendh.o: progs.h +gendh.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +gendh.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h +gendh.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h +gendh.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h +gendh.o: ../include/x509_vfy.h apps.h progs.h gendsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h gendsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h gendsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h gendsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h gendsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -gendsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h -gendsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h -gendsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -gendsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h -gendsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +gendsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +gendsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h +gendsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +gendsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +gendsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +gendsa.o: progs.h genrsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h genrsa.o: ../include/bn.h ../include/buffer.h ../include/cast.h genrsa.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h genrsa.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h genrsa.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -genrsa.o: ../include/objects.h ../include/pem.h ../include/pem2.h -genrsa.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h -genrsa.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -genrsa.o: ../include/rsa.h ../include/sha.h ../include/stack.h -genrsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +genrsa.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +genrsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h +genrsa.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +genrsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +genrsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h +genrsa.o: progs.h nseq.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h nseq.o: ../include/bn.h ../include/buffer.h ../include/cast.h nseq.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h nseq.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h nseq.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -nseq.o: ../include/objects.h ../include/pem.h ../include/pem2.h -nseq.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -nseq.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +nseq.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +nseq.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +nseq.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h nseq.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h nseq.o: progs.h openssl.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h @@ -295,10 +300,10 @@ openssl.o: ../include/conf.h ../include/crypto.h ../include/des.h openssl.o: ../include/dh.h ../include/dsa.h ../include/e_os.h ../include/err.h openssl.o: ../include/evp.h ../include/idea.h ../include/lhash.h openssl.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -openssl.o: ../include/objects.h ../include/pem.h ../include/pem2.h -openssl.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -openssl.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -openssl.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h +openssl.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +openssl.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h +openssl.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +openssl.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h openssl.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h openssl.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h openssl.o: progs.h s_apps.h @@ -307,9 +312,9 @@ pkcs7.o: ../include/bn.h ../include/buffer.h ../include/cast.h pkcs7.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h pkcs7.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h pkcs7.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -pkcs7.o: ../include/objects.h ../include/pem.h ../include/pem2.h -pkcs7.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -pkcs7.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +pkcs7.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +pkcs7.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +pkcs7.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h pkcs7.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h pkcs7.o: progs.h req.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h @@ -317,126 +322,130 @@ req.o: ../include/buffer.h ../include/cast.h ../include/conf.h req.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h req.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h req.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h -req.o: ../include/objects.h ../include/pem.h ../include/pem2.h -req.o: ../include/pkcs7.h ../include/rand.h ../include/rc2.h ../include/rc4.h -req.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -req.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h -req.o: ../include/x509v3.h apps.h progs.h +req.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +req.o: ../include/pem2.h ../include/pkcs7.h ../include/rand.h ../include/rc2.h +req.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h +req.o: ../include/sha.h ../include/stack.h ../include/x509.h +req.o: ../include/x509_vfy.h ../include/x509v3.h apps.h progs.h rsa.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h ../include/bn.h rsa.o: ../include/buffer.h ../include/cast.h ../include/crypto.h rsa.o: ../include/des.h ../include/dh.h ../include/dsa.h ../include/e_os.h rsa.o: ../include/err.h ../include/evp.h ../include/idea.h ../include/md2.h -rsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h ../include/pem.h -rsa.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -rsa.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h -rsa.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -rsa.o: progs.h +rsa.o: ../include/md5.h ../include/mdc2.h ../include/objects.h +rsa.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +rsa.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +rsa.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h ../include/stack.h +rsa.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_cb.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_cb.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_cb.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h s_cb.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h s_cb.o: ../include/lhash.h ../include/md2.h ../include/md5.h ../include/mdc2.h -s_cb.o: ../include/objects.h ../include/pkcs7.h ../include/rc2.h -s_cb.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h ../include/rsa.h -s_cb.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h ../include/ssl23.h -s_cb.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h -s_cb.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h +s_cb.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h +s_cb.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h +s_cb.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h +s_cb.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h +s_cb.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h +s_cb.o: progs.h s_apps.h s_client.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_client.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_client.o: ../include/crypto.h ../include/des.h ../include/dh.h s_client.o: ../include/dsa.h ../include/e_os.h ../include/err.h s_client.o: ../include/evp.h ../include/idea.h ../include/lhash.h s_client.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -s_client.o: ../include/objects.h ../include/pem.h ../include/pem2.h -s_client.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -s_client.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -s_client.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h -s_client.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h -s_client.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h -s_client.o: progs.h s_apps.h +s_client.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +s_client.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h +s_client.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +s_client.o: ../include/rsa.h ../include/sha.h ../include/ssl.h +s_client.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h +s_client.o: ../include/stack.h ../include/tls1.h ../include/x509.h +s_client.o: ../include/x509_vfy.h apps.h progs.h s_apps.h s_server.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_server.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_server.o: ../include/crypto.h ../include/des.h ../include/dh.h s_server.o: ../include/dsa.h ../include/e_os.h ../include/err.h s_server.o: ../include/evp.h ../include/idea.h ../include/lhash.h s_server.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -s_server.o: ../include/objects.h ../include/pem.h ../include/pem2.h -s_server.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -s_server.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -s_server.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h -s_server.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h -s_server.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h -s_server.o: progs.h s_apps.h +s_server.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +s_server.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h +s_server.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +s_server.o: ../include/rsa.h ../include/sha.h ../include/ssl.h +s_server.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h +s_server.o: ../include/stack.h ../include/tls1.h ../include/x509.h +s_server.o: ../include/x509_vfy.h apps.h progs.h s_apps.h s_socket.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_socket.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_socket.o: ../include/crypto.h ../include/des.h ../include/dh.h s_socket.o: ../include/dsa.h ../include/e_os.h ../include/evp.h s_socket.o: ../include/idea.h ../include/lhash.h ../include/md2.h s_socket.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -s_socket.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h -s_socket.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h -s_socket.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h -s_socket.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h -s_socket.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h -s_socket.o: progs.h s_apps.h +s_socket.o: ../include/opensslv.h ../include/pkcs7.h ../include/rc2.h +s_socket.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +s_socket.o: ../include/rsa.h ../include/sha.h ../include/ssl.h +s_socket.o: ../include/ssl2.h ../include/ssl23.h ../include/ssl3.h +s_socket.o: ../include/stack.h ../include/tls1.h ../include/x509.h +s_socket.o: ../include/x509_vfy.h apps.h progs.h s_apps.h s_time.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h s_time.o: ../include/bn.h ../include/buffer.h ../include/cast.h s_time.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h s_time.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h s_time.o: ../include/lhash.h ../include/md2.h ../include/md5.h -s_time.o: ../include/mdc2.h ../include/objects.h ../include/pem.h -s_time.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h -s_time.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -s_time.o: ../include/rsa.h ../include/sha.h ../include/ssl.h ../include/ssl2.h -s_time.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h -s_time.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h -s_time.o: progs.h s_apps.h +s_time.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h +s_time.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h +s_time.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +s_time.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +s_time.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h +s_time.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h +s_time.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h s_apps.h sess_id.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h sess_id.o: ../include/bn.h ../include/buffer.h ../include/cast.h sess_id.o: ../include/crypto.h ../include/des.h ../include/dh.h sess_id.o: ../include/dsa.h ../include/e_os.h ../include/err.h ../include/evp.h sess_id.o: ../include/idea.h ../include/lhash.h ../include/md2.h sess_id.o: ../include/md5.h ../include/mdc2.h ../include/objects.h -sess_id.o: ../include/pem.h ../include/pem2.h ../include/pkcs7.h -sess_id.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h -sess_id.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -sess_id.o: ../include/ssl.h ../include/ssl2.h ../include/ssl23.h -sess_id.o: ../include/ssl3.h ../include/stack.h ../include/tls1.h -sess_id.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h +sess_id.o: ../include/opensslv.h ../include/pem.h ../include/pem2.h +sess_id.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +sess_id.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h +sess_id.o: ../include/sha.h ../include/ssl.h ../include/ssl2.h +sess_id.o: ../include/ssl23.h ../include/ssl3.h ../include/stack.h +sess_id.o: ../include/tls1.h ../include/x509.h ../include/x509_vfy.h apps.h +sess_id.o: progs.h speed.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h speed.o: ../include/bn.h ../include/buffer.h ../include/cast.h speed.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h speed.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/hmac.h speed.o: ../include/idea.h ../include/md2.h ../include/md5.h ../include/mdc2.h -speed.o: ../include/objects.h ../include/pkcs7.h ../include/rand.h -speed.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h ../include/ripemd.h -speed.o: ../include/rsa.h ../include/sha.h ../include/stack.h ../include/x509.h -speed.o: ../include/x509_vfy.h ./testdsa.h ./testrsa.h apps.h progs.h +speed.o: ../include/objects.h ../include/opensslv.h ../include/pkcs7.h +speed.o: ../include/rand.h ../include/rc2.h ../include/rc4.h ../include/rc5.h +speed.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +speed.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h ./testdsa.h +speed.o: ./testrsa.h apps.h progs.h verify.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h verify.o: ../include/bn.h ../include/buffer.h ../include/cast.h verify.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h verify.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h verify.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -verify.o: ../include/objects.h ../include/pem.h ../include/pem2.h -verify.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -verify.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h -verify.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h apps.h -verify.o: progs.h +verify.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +verify.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h +verify.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h +verify.o: ../include/rsa.h ../include/sha.h ../include/stack.h +verify.o: ../include/x509.h ../include/x509_vfy.h apps.h progs.h version.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h version.o: ../include/bn.h ../include/buffer.h ../include/cast.h version.o: ../include/crypto.h ../include/des.h ../include/dh.h version.o: ../include/dsa.h ../include/e_os.h ../include/evp.h version.o: ../include/idea.h ../include/md2.h ../include/md5.h -version.o: ../include/mdc2.h ../include/objects.h ../include/rc2.h -version.o: ../include/rc4.h ../include/rc5.h ../include/ripemd.h -version.o: ../include/rsa.h ../include/sha.h ../include/stack.h apps.h progs.h +version.o: ../include/mdc2.h ../include/objects.h ../include/opensslv.h +version.o: ../include/rc2.h ../include/rc4.h ../include/rc5.h +version.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +version.o: ../include/stack.h apps.h progs.h x509.o: ../include/asn1.h ../include/bio.h ../include/blowfish.h x509.o: ../include/bn.h ../include/buffer.h ../include/cast.h x509.o: ../include/crypto.h ../include/des.h ../include/dh.h ../include/dsa.h x509.o: ../include/e_os.h ../include/err.h ../include/evp.h ../include/idea.h x509.o: ../include/md2.h ../include/md5.h ../include/mdc2.h -x509.o: ../include/objects.h ../include/pem.h ../include/pem2.h -x509.o: ../include/pkcs7.h ../include/rc2.h ../include/rc4.h ../include/rc5.h -x509.o: ../include/ripemd.h ../include/rsa.h ../include/sha.h +x509.o: ../include/objects.h ../include/opensslv.h ../include/pem.h +x509.o: ../include/pem2.h ../include/pkcs7.h ../include/rc2.h ../include/rc4.h +x509.o: ../include/rc5.h ../include/ripemd.h ../include/rsa.h ../include/sha.h x509.o: ../include/stack.h ../include/x509.h ../include/x509_vfy.h x509.o: ../include/x509v3.h apps.h progs.h diff --git a/apps/s_apps.h b/apps/s_apps.h index ba320946be..145207f5fe 100644 --- a/apps/s_apps.h +++ b/apps/s_apps.h @@ -62,7 +62,7 @@ #ifndef NOPROTO int do_accept(int acc_sock, int *sock, char **host); -int do_server(int port, int *ret, int (*cb) ()); +int do_server(int port, int *ret, int (*cb) (), char *context); #ifdef HEADER_X509_H int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); #else diff --git a/apps/s_server.c b/apps/s_server.c index df2ff5dc31..7d9df46085 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -76,8 +76,8 @@ #ifndef NOPROTO static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength); -static int sv_body(char *hostname, int s); -static int www_body(char *hostname, int s); +static int sv_body(char *hostname, int s, char *context); +static int www_body(char *hostname, int s, char *context); static void close_accept_socket(void ); static void sv_usage(void); static int init_ssl_connection(SSL *s); @@ -190,6 +190,7 @@ static void sv_usage() BIO_printf(bio_err,"usage: s_server [args ...]\n"); BIO_printf(bio_err,"\n"); BIO_printf(bio_err," -accept arg - port to accept on (default is %d)\n",PORT); + BIO_printf(bio_err," -context arg - set session ID context\n"); BIO_printf(bio_err," -verify arg - turn on peer certificate verification\n"); BIO_printf(bio_err," -Verify arg - turn on peer certificate verification, must have a cert.\n"); BIO_printf(bio_err," -cert arg - certificate file to use, PEM format assumed\n"); @@ -231,6 +232,7 @@ char *argv[]; { short port=PORT; char *CApath=NULL,*CAfile=NULL; + char *context = NULL; int badop=0,bugs=0; int ret=1; int off=0; @@ -292,6 +294,11 @@ char *argv[]; verify_depth=atoi(*(++argv)); BIO_printf(bio_err,"verify depth is %d, must return a certificate\n",verify_depth); } + else if (strcmp(*argv,"-context") == 0) + { + if (--argc < 1) goto bad; + context= *(++argv); + } else if (strcmp(*argv,"-cert") == 0) { if (--argc < 1) goto bad; @@ -511,9 +518,9 @@ bad: BIO_printf(bio_s_out,"ACCEPT\n"); if (www) - do_server(port,&accept_socket,www_body); + do_server(port,&accept_socket,www_body, context); else - do_server(port,&accept_socket,sv_body); + do_server(port,&accept_socket,sv_body, context); print_stats(bio_s_out,ctx); ret=0; end: @@ -553,9 +560,10 @@ SSL_CTX *ssl_ctx; SSL_CTX_sess_get_cache_size(ssl_ctx)); } -static int sv_body(hostname, s) +static int sv_body(hostname, s, context) char *hostname; int s; +char *context; { char *buf=NULL; fd_set readfds; @@ -582,8 +590,11 @@ int s; } #endif - if (con == NULL) + if (con == NULL) { con=(SSL *)SSL_new(ctx); + if(context) + SSL_set_session_id_context(con, context, strlen(context)); + } SSL_clear(con); sbio=BIO_new_socket(s,BIO_NOCLOSE); @@ -870,9 +881,10 @@ char *file; } #endif -static int www_body(hostname, s) +static int www_body(hostname, s, context) char *hostname; int s; +char *context; { char *buf=NULL; int ret=1; @@ -905,6 +917,7 @@ int s; if (!BIO_set_write_buffer_size(io,bufsize)) goto err; if ((con=(SSL *)SSL_new(ctx)) == NULL) goto err; + if(context) SSL_set_session_id_context(con, context, strlen(context)); sbio=BIO_new_socket(s,BIO_NOCLOSE); if (s_nbio_test) diff --git a/apps/s_socket.c b/apps/s_socket.c index 5c171c31ae..6274acf53b 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -280,10 +280,11 @@ int port; return(1); } -int do_server(port, ret, cb) +int do_server(port, ret, cb, context) int port; int *ret; int (*cb)(); +char *context; { int sock; char *name; @@ -304,7 +305,7 @@ int (*cb)(); SHUTDOWN(accept_socket); return(0); } - i=(*cb)(name,sock); + i=(*cb)(name,sock, context); if (name != NULL) Free(name); SHUTDOWN2(sock); if (i < 0) diff --git a/apps/sess_id.c b/apps/sess_id.c index bad6364d10..4a1860d080 100644 --- a/apps/sess_id.c +++ b/apps/sess_id.c @@ -79,6 +79,7 @@ static char *sess_id_usage[]={ " -text - print ssl session id details\n", " -cert - output certificate \n", " -noout - no CRL output\n", +" -context arg - set the session ID context\n", NULL }; @@ -96,7 +97,7 @@ char **argv; int ret=1,i,num,badops=0; BIO *out=NULL; int informat,outformat; - char *infile=NULL,*outfile=NULL; + char *infile=NULL,*outfile=NULL,*context=NULL; int cert=0,noout=0,text=0; char **pp; @@ -140,6 +141,11 @@ char **argv; cert= ++num; else if (strcmp(*argv,"-noout") == 0) noout= ++num; + else if (strcmp(*argv,"-context") == 0) + { + if(--argc < 1) goto bad; + context=*++argv; + } else { BIO_printf(bio_err,"unknown option %s\n",*argv); @@ -162,6 +168,17 @@ bad: x=load_sess_id(infile,informat); if (x == NULL) { goto end; } + if(context) + { + x->sid_ctx_length=strlen(context); + if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH) + { + BIO_printf(bio_err,"Context too long\n"); + goto end; + } + memcpy(x->sid_ctx,context,x->sid_ctx_length); + } + #ifdef undef /* just testing for memory leaks :-) */ { |