Commit 71fa4513 authored by Ben Laurie's avatar Ben Laurie
Browse files

Version skew reduction: trivia (I hope).

parent a9e1c50b

apps/Makefile

+118 −123
Original line number Diff line number Diff line
@@ -334,19 +334,20 @@ dh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dh.c 
dsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

dsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h

dsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h

dsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

dsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

dsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

dsa.o: ../include/openssl/err.h ../include/openssl/evp.h

dsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h

dsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

dsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h

dsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

dsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

dsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h dsa.c

dsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h

dsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

dsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

dsa.o: ../include/openssl/engine.h ../include/openssl/err.h

dsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h

dsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

dsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

dsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

dsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h

dsa.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h

dsa.o: ../include/openssl/sha.h ../include/openssl/stack.h

dsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

dsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

dsa.o: ../include/openssl/x509v3.h apps.h dsa.c

dsaparam.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

dsaparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h

dsaparam.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -359,13 +360,11 @@ dsaparam.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h 
dsaparam.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h

dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h

dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h

dsaparam.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

dsaparam.o: ../include/openssl/ui.h ../include/openssl/x509.h

dsaparam.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

dsaparam.o: dsaparam.c

dsaparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

dsaparam.o: ../include/openssl/x509v3.h apps.h dsaparam.c

ec.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

ec.o: ../include/openssl/buffer.h ../include/openssl/conf.h

ec.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -458,39 +457,37 @@ errstr.o: ../include/openssl/x509v3.h apps.h errstr.c 
gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h

gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h

gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h

gendh.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

gendh.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

gendh.o: ../include/openssl/engine.h ../include/openssl/err.h

gendh.o: ../include/openssl/evp.h ../include/openssl/lhash.h

gendh.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

gendh.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

gendh.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h

gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

gendh.o: ../include/openssl/dh.h ../include/openssl/e_os2.h

gendh.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

gendh.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

gendh.o: ../include/openssl/err.h ../include/openssl/evp.h

gendh.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h

gendh.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

gendh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

gendh.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

gendh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

gendh.o: ../include/openssl/rand.h ../include/openssl/safestack.h

gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h

gendh.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

gendh.o: ../include/openssl/ui.h ../include/openssl/x509.h

gendh.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

gendh.o: gendh.c

gendh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

gendh.o: ../include/openssl/x509v3.h apps.h gendh.c

gendsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

gendsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h

gendsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h

gendsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

gendsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

gendsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h

gendsa.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h

gendsa.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

gendsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h

gendsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

gendsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

gendsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

gendsa.o: gendsa.c

gendsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h

gendsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

gendsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

gendsa.o: ../include/openssl/engine.h ../include/openssl/err.h

gendsa.o: ../include/openssl/evp.h ../include/openssl/lhash.h

gendsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

gendsa.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

gendsa.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

gendsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h

gendsa.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h

gendsa.o: ../include/openssl/sha.h ../include/openssl/stack.h

gendsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

gendsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

gendsa.o: ../include/openssl/x509v3.h apps.h gendsa.c

genpkey.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

genpkey.o: ../include/openssl/buffer.h ../include/openssl/conf.h

genpkey.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -510,7 +507,6 @@ genpkey.o: genpkey.c 
genrsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

genrsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h

genrsa.o: ../include/openssl/conf.h ../include/openssl/crypto.h

genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h

genrsa.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

genrsa.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

genrsa.o: ../include/openssl/engine.h ../include/openssl/err.h
@@ -523,9 +519,8 @@ genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h 
genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h

genrsa.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

genrsa.o: ../include/openssl/ui.h ../include/openssl/x509.h

genrsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

genrsa.o: genrsa.c

genrsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

genrsa.o: ../include/openssl/x509v3.h apps.h genrsa.c

nseq.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

nseq.o: ../include/openssl/buffer.h ../include/openssl/conf.h

nseq.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -738,11 +733,10 @@ req.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h 
req.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

req.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

req.o: ../include/openssl/pem.h ../include/openssl/pem2.h

req.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

req.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

req.o: ../include/openssl/sha.h ../include/openssl/stack.h

req.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

req.o: ../include/openssl/ui.h ../include/openssl/x509.h

req.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h

req.o: ../include/openssl/safestack.h ../include/openssl/sha.h

req.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

req.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

req.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h req.c

rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

rsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
@@ -761,21 +755,22 @@ rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h 
rsa.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

rsa.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h rsa.c

rsautl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

rsautl.o: ../include/openssl/buffer.h ../include/openssl/conf.h

rsautl.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h

rsautl.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

rsautl.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

rsautl.o: ../include/openssl/err.h ../include/openssl/evp.h

rsautl.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h

rsautl.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

rsautl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

rsautl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

rsautl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

rsautl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

rsautl.o: ../include/openssl/sha.h ../include/openssl/stack.h

rsautl.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

rsautl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

rsautl.o: ../include/openssl/x509v3.h apps.h rsautl.c

rsautl.o: ../include/openssl/bn.h ../include/openssl/buffer.h

rsautl.o: ../include/openssl/conf.h ../include/openssl/crypto.h

rsautl.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

rsautl.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

rsautl.o: ../include/openssl/engine.h ../include/openssl/err.h

rsautl.o: ../include/openssl/evp.h ../include/openssl/lhash.h

rsautl.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

rsautl.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

rsautl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

rsautl.o: ../include/openssl/pem.h ../include/openssl/pem2.h

rsautl.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h

rsautl.o: ../include/openssl/safestack.h ../include/openssl/sha.h

rsautl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

rsautl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

rsautl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

rsautl.o: rsautl.c

s_cb.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

s_cb.o: ../include/openssl/buffer.h ../include/openssl/comp.h

s_cb.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -825,25 +820,24 @@ s_server.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h 
s_server.o: ../include/openssl/bn.h ../include/openssl/buffer.h

s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h

s_server.o: ../include/openssl/crypto.h ../include/openssl/dh.h

s_server.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h

s_server.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

s_server.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

s_server.o: ../include/openssl/engine.h ../include/openssl/err.h

s_server.o: ../include/openssl/evp.h ../include/openssl/hmac.h

s_server.o: ../include/openssl/kssl.h ../include/openssl/lhash.h

s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

s_server.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

s_server.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h

s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h

s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h

s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h

s_server.o: ../include/openssl/srp.h ../include/openssl/srtp.h

s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h

s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h

s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

s_server.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h

s_server.o: ../include/openssl/ui.h ../include/openssl/x509.h

s_server.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h

s_server.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

s_server.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

s_server.o: ../include/openssl/err.h ../include/openssl/evp.h

s_server.o: ../include/openssl/hmac.h ../include/openssl/kssl.h

s_server.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h

s_server.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

s_server.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

s_server.o: ../include/openssl/pqueue.h ../include/openssl/rand.h

s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

s_server.o: ../include/openssl/sha.h ../include/openssl/srp.h

s_server.o: ../include/openssl/srtp.h ../include/openssl/ssl.h

s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h

s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h

s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h

s_server.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

s_server.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

s_server.o: s_apps.h s_server.c timeouts.h

s_socket.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
@@ -931,26 +925,27 @@ speed.o: ../include/openssl/bn.h ../include/openssl/buffer.h 
speed.o: ../include/openssl/camellia.h ../include/openssl/cast.h

speed.o: ../include/openssl/conf.h ../include/openssl/crypto.h

speed.o: ../include/openssl/des.h ../include/openssl/des_old.h

speed.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

speed.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

speed.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

speed.o: ../include/openssl/err.h ../include/openssl/evp.h

speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h

speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h

speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h

speed.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h

speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h

speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h

speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h

speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

speed.o: ../include/openssl/seed.h ../include/openssl/sha.h

speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h

speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h

speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h

speed.o: ../include/openssl/dh.h ../include/openssl/dsa.h

speed.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

speed.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

speed.o: ../include/openssl/engine.h ../include/openssl/err.h

speed.o: ../include/openssl/evp.h ../include/openssl/hmac.h

speed.o: ../include/openssl/idea.h ../include/openssl/lhash.h

speed.o: ../include/openssl/md4.h ../include/openssl/md5.h

speed.o: ../include/openssl/mdc2.h ../include/openssl/modes.h

speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

speed.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h

speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h

speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h

speed.o: ../include/openssl/safestack.h ../include/openssl/seed.h

speed.o: ../include/openssl/sha.h ../include/openssl/stack.h

speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h

speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h

speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h

speed.o: speed.c testdsa.h testrsa.h

spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h

spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -1037,17 +1032,17 @@ version.o: ../include/openssl/x509v3.h apps.h version.c 
x509.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h

x509.o: ../include/openssl/bn.h ../include/openssl/buffer.h

x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h

x509.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h

x509.o: ../include/openssl/ec.h ../include/openssl/ecdh.h

x509.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h

x509.o: ../include/openssl/err.h ../include/openssl/evp.h

x509.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h

x509.o: ../include/openssl/objects.h ../include/openssl/ocsp.h

x509.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

x509.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h

x509.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h

x509.o: ../include/openssl/rsa.h ../include/openssl/safestack.h

x509.o: ../include/openssl/sha.h ../include/openssl/stack.h

x509.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h

x509.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h

x509.o: ../include/openssl/x509v3.h apps.h x509.c
 
x509.o: ../include/openssl/dh.h ../include/openssl/dsa.h

x509.o: ../include/openssl/e_os2.h ../include/openssl/ec.h

x509.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h

x509.o: ../include/openssl/engine.h ../include/openssl/err.h

x509.o: ../include/openssl/evp.h ../include/openssl/lhash.h

x509.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h

x509.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h

x509.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

x509.o: ../include/openssl/pem.h ../include/openssl/pem2.h

x509.o: ../include/openssl/pkcs7.h ../include/openssl/rsa.h

x509.o: ../include/openssl/safestack.h ../include/openssl/sha.h

x509.o: ../include/openssl/stack.h ../include/openssl/symhacks.h

x509.o: ../include/openssl/txt_db.h ../include/openssl/x509.h

x509.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h x509.c

apps/apps.c

+46 −44
Original line number Diff line number Diff line
@@ -2334,7 +2334,8 @@ int args_verify(char ***pargs, int *pargc, 
		else

			{

			long timestamp;

			/* interpret argument as seconds since Epoch */

			/* interpret the -attime argument as seconds since

			 * Epoch */

			if (sscanf(argn, "%li", &timestamp) != 1)

				{

				BIO_printf(bio_err,
@@ -2740,6 +2741,50 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret) 


#endif



#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)

/* next_protos_parse parses a comma separated list of strings into a string

 * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.

 *   outlen: (output) set to the length of the resulting buffer on success.

 *   err: (maybe NULL) on failure, an error message line is written to this BIO.

 *   in: a NUL termianted string like "abc,def,ghi"

 *

 *   returns: a malloced buffer or NULL on failure.

 */

unsigned char *next_protos_parse(unsigned short *outlen, const char *in)

	{

	size_t len;

	unsigned char *out;

	size_t i, start = 0;



	len = strlen(in);

	if (len >= 65535)

		return NULL;



	out = OPENSSL_malloc(strlen(in) + 1);

	if (!out)

		return NULL;



	for (i = 0; i <= len; ++i)

		{

		if (i == len || in[i] == ',')

			{

			if (i - start > 255)

				{

				OPENSSL_free(out);

				return NULL;

				}

			out[start] = i - start;

			start = i + 1;

			}

		else

			out[i+1] = in[i];

		}



	*outlen = len + 1;

	return out;

	}

#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */



/*

 * Platform-specific sections

 */
@@ -3065,46 +3110,3 @@ int raw_write_stdout(const void *buf,int siz) 
int raw_write_stdout(const void *buf,int siz)

	{	return write(fileno(stdout),buf,siz);	}

#endif
 


#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)

/* next_protos_parse parses a comma separated list of strings into a string

 * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.

 *   outlen: (output) set to the length of the resulting buffer on success.

 *   in: a NUL termianted string like "abc,def,ghi"

 *

 *   returns: a malloced buffer or NULL on failure.

 */

unsigned char *next_protos_parse(unsigned short *outlen, const char *in)

	{

	size_t len;

	unsigned char *out;

	size_t i, start = 0;



	len = strlen(in);

	if (len >= 65535)

		return NULL;



	out = OPENSSL_malloc(strlen(in) + 1);

	if (!out)

		return NULL;



	for (i = 0; i <= len; ++i)

		{

		if (i == len || in[i] == ',')

			{

			if (i - start > 255)

				{

				OPENSSL_free(out);

				return NULL;

				}

			out[start] = i - start;

			start = i + 1;

			}

		else

			out[i+1] = in[i];

		}



	*outlen = len + 1;

	return out;

	}

#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */

apps/apps.h

+4 −3
Original line number Diff line number Diff line
@@ -331,6 +331,10 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret); 
void jpake_server_auth(BIO *out, BIO *conn, const char *secret);

#endif



#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)

unsigned char *next_protos_parse(unsigned short *outlen, const char *in);

#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */



#define FORMAT_UNDEF    0

#define FORMAT_ASN1     1

#define FORMAT_TEXT     2
@@ -363,10 +367,7 @@ int raw_write_stdout(const void *,int); 
#define TM_START	0

#define TM_STOP		1

double app_tminterval (int stop,int usertime);

#endif



#define OPENSSL_NO_SSL_INTERN



#ifndef OPENSSL_NO_NEXTPROTONEG

unsigned char *next_protos_parse(unsigned short *outlen, const char *in);

#endif

apps/s_client.c

+12 −12
Original line number Diff line number Diff line
@@ -2061,17 +2061,6 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
		expansion ? SSL_COMP_get_name(expansion) : "NONE");

#endif

 

#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)

	if (next_proto.status != -1) {

		const unsigned char *proto;

		unsigned int proto_len;

		SSL_get0_next_proto_negotiated(s, &proto, &proto_len);

		BIO_printf(bio, "Next protocol: (%d) ", next_proto.status);

		BIO_write(bio, proto, proto_len);

		BIO_write(bio, "\n", 1);

	}

#endif



#ifdef SSL_DEBUG

	{

	/* Print out local port of connection: useful for debugging */
@@ -2084,6 +2073,17 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
	}

#endif



#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)

	if (next_proto.status != -1) {

		const unsigned char *proto;

		unsigned int proto_len;

		SSL_get0_next_proto_negotiated(s, &proto, &proto_len);

		BIO_printf(bio, "Next protocol: (%d) ", next_proto.status);

		BIO_write(bio, proto, proto_len);

		BIO_write(bio, "\n", 1);

	}

#endif



 	{

 	SRTP_PROTECTION_PROFILE *srtp_profile=SSL_get_selected_srtp_profile(s);

apps/s_server.c

+14 −16

File changed.

Preview size limit exceeded, changes collapsed.