aboutsummaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/test
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@iij.ad.jp>2015-12-04 00:41:27 +0900
committerShigeki Ohtsu <ohtsu@iij.ad.jp>2015-12-04 03:56:12 +0900
commitff4f16b7dd92f74bfa77207c623d6e7d13e19baf (patch)
treee2d867b594a7281e98d22c754425b06187d8fe91 /deps/openssl/openssl/test
parent181816ea1629b6bb8419d72a4fbe93df0f094831 (diff)
downloadandroid-node-v8-ff4f16b7dd92f74bfa77207c623d6e7d13e19baf.tar.gz
android-node-v8-ff4f16b7dd92f74bfa77207c623d6e7d13e19baf.tar.bz2
android-node-v8-ff4f16b7dd92f74bfa77207c623d6e7d13e19baf.zip
deps: upgrade openssl sources to 1.0.2e
This just replaces all sources of openssl-1.0.2e.tar.gz into deps/openssl/openssl deps: copy all openssl header files to include dir All symlink files in `deps/openssl/openssl/include/openssl/` are removed and replaced with real header files to avoid issues on Windows. Two files of opensslconf.h in crypto and include dir are replaced to refer config/opensslconf.h. deps: fix openssl assembly error on ia32 win32 `x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . deps: fix asm build error of openssl in x86_win32 See https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html node needs to stop using masm and move to nasm or yasm on Win32. openssl: fix keypress requirement in apps on win32 Reapply b910613792dac946b295855963869933a9089044 . deps: add -no_rand_screen to openssl s_client In openssl s_client on Windows, RAND_screen() is invoked to initialize random state but it takes several seconds in each connection. This added -no_rand_screen to openssl s_client on Windows to skip RAND_screen() and gets a better performance in the unit test of test-tls-server-verify. Do not enable this except to use in the unit test. deps: update openssl config files Regenrate config files for supported platforms with Makefile. deps: update openssl asm and asm_obsolete files Regenerate asm files with Makefile and CC=gcc and ASM=gcc where gcc-4.8.4. Also asm files in asm_obsolete dir to support old compiler and assmebler are regenerated without CC and ASM envs. PR-URL: https://github.com/nodejs/node/pull/4134 Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/openssl/openssl/test')
-rw-r--r--deps/openssl/openssl/test/Makefile41
-rwxr-xr-xdeps/openssl/openssl/test/bctest111
l---------deps/openssl/openssl/test/bftest.c2
l---------deps/openssl/openssl/test/bntest.c2
l---------deps/openssl/openssl/test/casttest.c2
-rw-r--r--deps/openssl/openssl/test/certs/pss1.pem21
l---------deps/openssl/openssl/test/clienthellotest.c1
l---------deps/openssl/openssl/test/constant_time_test.c2
l---------deps/openssl/openssl/test/destest.c2
l---------deps/openssl/openssl/test/dhtest.c2
l---------deps/openssl/openssl/test/dsatest.c2
l---------deps/openssl/openssl/test/ecdhtest.c2
l---------deps/openssl/openssl/test/ecdsatest.c2
l---------deps/openssl/openssl/test/ectest.c2
l---------deps/openssl/openssl/test/enginetest.c2
l---------deps/openssl/openssl/test/evp_extra_test.c2
l---------deps/openssl/openssl/test/evp_test.c2
l---------deps/openssl/openssl/test/exptest.c2
l---------deps/openssl/openssl/test/heartbeat_test.c2
l---------deps/openssl/openssl/test/hmactest.c2
l---------deps/openssl/openssl/test/ideatest.c2
l---------deps/openssl/openssl/test/jpaketest.c2
l---------deps/openssl/openssl/test/md2test.c2
l---------deps/openssl/openssl/test/md4test.c2
l---------deps/openssl/openssl/test/md5test.c2
l---------deps/openssl/openssl/test/mdc2test.c2
l---------deps/openssl/openssl/test/randtest.c2
l---------deps/openssl/openssl/test/rc2test.c2
l---------deps/openssl/openssl/test/rc4test.c2
l---------deps/openssl/openssl/test/rc5test.c2
l---------deps/openssl/openssl/test/rmdtest.c2
l---------deps/openssl/openssl/test/rsa_test.c2
l---------deps/openssl/openssl/test/sha1test.c2
l---------deps/openssl/openssl/test/sha256t.c2
l---------deps/openssl/openssl/test/sha512t.c2
l---------deps/openssl/openssl/test/shatest.c2
l---------deps/openssl/openssl/test/srptest.c2
l---------deps/openssl/openssl/test/ssltest.c2
-rw-r--r--deps/openssl/openssl/test/tx5097
l---------deps/openssl/openssl/test/v3nametest.c2
l---------deps/openssl/openssl/test/verify_extra_test.c2
l---------deps/openssl/openssl/test/wp_test.c2
42 files changed, 102 insertions, 153 deletions
diff --git a/deps/openssl/openssl/test/Makefile b/deps/openssl/openssl/test/Makefile
index e695073fd3..b180971b28 100644
--- a/deps/openssl/openssl/test/Makefile
+++ b/deps/openssl/openssl/test/Makefile
@@ -69,6 +69,7 @@ ASN1TEST= asn1test
HEARTBEATTEST= heartbeat_test
CONSTTIMETEST= constant_time_test
VERIFYEXTRATEST= verify_extra_test
+CLIENTHELLOTEST= clienthellotest
TESTS= alltests
@@ -81,7 +82,8 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
$(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
$(EVPTEST)$(EXE_EXT) $(EVPEXTRATEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
$(ASN1TEST)$(EXE_EXT) $(V3NAMETEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) \
- $(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT)
+ $(CONSTTIMETEST)$(EXE_EXT) $(VERIFYEXTRATEST)$(EXE_EXT) \
+ $(CLIENTHELLOTEST)$(EXE_EXT)
# $(METHTEST)$(EXE_EXT)
@@ -94,7 +96,8 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
$(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
$(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \
$(EVPTEST).o $(EVPEXTRATEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(V3NAMETEST).o \
- $(HEARTBEATTEST).o $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o
+ $(HEARTBEATTEST).o $(CONSTTIMETEST).o $(VERIFYEXTRATEST).o \
+ $(CLIENTHELLOTEST).o
SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
$(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \
@@ -104,7 +107,8 @@ SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
$(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
$(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \
$(EVPTEST).c $(EVPEXTRATEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \
- $(V3NAMETEST).c $(HEARTBEATTEST).c $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c
+ $(V3NAMETEST).c $(HEARTBEATTEST).c $(CONSTTIMETEST).c $(VERIFYEXTRATEST).c \
+ $(CLIENTHELLOTEST).c
EXHEADER=
HEADER= testutil.h $(EXHEADER)
@@ -148,7 +152,7 @@ alltests: \
test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
test_ss test_ca test_engine test_evp test_evp_extra test_ssl test_tsa test_ige \
test_jpake test_srp test_cms test_ocsp test_v3name test_heartbeat \
- test_constant_time test_verify_extra
+ test_constant_time test_verify_extra test_clienthello
test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
@@ -241,7 +245,7 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
@../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
@echo quit >>tmp.bntest
@echo "running bc"
- @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
+ @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0\r?$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
@echo 'test a^b%c implementations'
../util/shlib_wrap.sh ./$(EXPTEST)
@@ -353,6 +357,10 @@ test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
@echo $(START) $@
../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
+test_clienthello: $(CLIENTHELLOTEST)$(EXE_EXT)
+ @echo $(START) $@
+ ../util/shlib_wrap.sh ./$(CLIENTHELLOTEST)
+
lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
@@ -527,6 +535,9 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
$(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
+$(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
+ @target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+
#$(AESTEST).o: $(AESTEST).c
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
@@ -572,6 +583,26 @@ bntest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
bntest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bntest.c
casttest.o: ../e_os.h ../include/openssl/cast.h ../include/openssl/e_os2.h
casttest.o: ../include/openssl/opensslconf.h casttest.c
+clienthellotest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+clienthellotest.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+clienthellotest.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
+clienthellotest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+clienthellotest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+clienthellotest.o: ../include/openssl/err.h ../include/openssl/evp.h
+clienthellotest.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
+clienthellotest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+clienthellotest.o: ../include/openssl/objects.h
+clienthellotest.o: ../include/openssl/opensslconf.h
+clienthellotest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+clienthellotest.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+clienthellotest.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+clienthellotest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+clienthellotest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+clienthellotest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+clienthellotest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+clienthellotest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+clienthellotest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+clienthellotest.o: clienthellotest.c
constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h
constant_time_test.o: ../include/openssl/e_os2.h
constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c
diff --git a/deps/openssl/openssl/test/bctest b/deps/openssl/openssl/test/bctest
deleted file mode 100755
index bdb3218f7a..0000000000
--- a/deps/openssl/openssl/test/bctest
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-# This script is used by test/Makefile.ssl to check whether a sane 'bc'
-# is installed.
-# ('make test_bn' should not try to run 'bc' if it does not exist or if
-# it is a broken 'bc' version that is known to cause trouble.)
-#
-# If 'bc' works, we also test if it knows the 'print' command.
-#
-# In any case, output an appropriate command line for running (or not
-# running) bc.
-
-
-IFS=:
-try_without_dir=true
-# First we try "bc", then "$dir/bc" for each item in $PATH.
-for dir in dummy:$PATH; do
- if [ "$try_without_dir" = true ]; then
- # first iteration
- bc=bc
- try_without_dir=false
- else
- # second and later iterations
- bc="$dir/bc"
- if [ ! -f "$bc" ]; then # '-x' is not available on Ultrix
- bc=''
- fi
- fi
-
- if [ ! "$bc" = '' ]; then
- failure=none
-
-
- # Test for SunOS 5.[78] bc bug
- "$bc" >tmp.bctest <<\EOF
-obase=16
-ibase=16
-a=AD88C418F31B3FC712D0425001D522B3AE9134FF3A98C13C1FCC1682211195406C1A6C66C6A\
-CEEC1A0EC16950233F77F1C2F2363D56DD71A36C57E0B2511FC4BA8F22D261FE2E9356D99AF57\
-10F3817C0E05BF79C423C3F66FDF321BE8D3F18F625D91B670931C1EF25F28E489BDA1C5422D1\
-C3F6F7A1AD21585746ECC4F10A14A778AF56F08898E965E9909E965E0CB6F85B514150C644759\
-3BE731877B16EA07B552088FF2EA728AC5E0FF3A23EB939304519AB8B60F2C33D6BA0945B66F0\
-4FC3CADF855448B24A9D7640BCF473E
-b=DCE91E7D120B983EA9A104B5A96D634DD644C37657B1C7860B45E6838999B3DCE5A555583C6\
-9209E41F413422954175A06E67FFEF6746DD652F0F48AEFECC3D8CAC13523BDAAD3F5AF4212BD\
-8B3CD64126E1A82E190228020C05B91C8B141F1110086FC2A4C6ED631EBA129D04BB9A19FC53D\
-3ED0E2017D60A68775B75481449
-(a/b)*b + (a%b) - a
-EOF
- if [ 0 != "`cat tmp.bctest`" ]; then
- failure=SunOStest
- fi
-
-
- if [ "$failure" = none ]; then
- # Test for SCO bc bug.
- "$bc" >tmp.bctest <<\EOF
-obase=16
-ibase=16
--FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4AEC6F15AC177F176F2274D2\
-9DC8022EA0D7DD3ABE9746D2D46DD3EA5B5F6F69DF12877E0AC5E7F5ADFACEE54573F5D256A06\
-11B5D2BC24947724E22AE4EC3FB0C39D9B4694A01AFE5E43B4D99FB9812A0E4A5773D8B254117\
-1239157EC6E3D8D50199 * -FFDD63BA1A4648F0D804F8A1C66C53F0D2110590E8A3907EC73B4\
-AEC6F15AC177F176F2274D29DC8022EA0D7DD3ABE9746D2D46DD3EA5B5F6F69DF12877E0AC5E7\
-F5ADFACEE54573F5D256A0611B5D2BC24947724E22AE4EC3FB0C39D9B4694A01AFE5E43B4D99F\
-B9812A0E4A5773D8B2541171239157EC6E3D8D50199 - FFBACC221682DA464B6D7F123482522\
-02EDAEDCA38C3B69E9B7BBCD6165A9CD8716C4903417F23C09A85B851961F92C217258CEEB866\
-85EFCC5DD131853A02C07A873B8E2AF2E40C6D5ED598CD0E8F35AD49F3C3A17FDB7653E4E2DC4\
-A8D23CC34686EE4AD01F7407A7CD74429AC6D36DBF0CB6A3E302D0E5BDFCD048A3B90C1BE5AA8\
-E16C3D5884F9136B43FF7BB443764153D4AEC176C681B078F4CC53D6EB6AB76285537DDEE7C18\
-8C72441B52EDBDDBC77E02D34E513F2AABF92F44109CAFE8242BD0ECBAC5604A94B02EA44D43C\
-04E9476E6FBC48043916BFA1485C6093603600273C9C33F13114D78064AE42F3DC466C7DA543D\
-89C8D71
-AD534AFBED2FA39EE9F40E20FCF9E2C861024DB98DDCBA1CD118C49CA55EEBC20D6BA51B2271C\
-928B693D6A73F67FEB1B4571448588B46194617D25D910C6A9A130CC963155CF34079CB218A44\
-8A1F57E276D92A33386DDCA3D241DB78C8974ABD71DD05B0FA555709C9910D745185E6FE108E3\
-37F1907D0C56F8BFBF52B9704 % -E557905B56B13441574CAFCE2BD257A750B1A8B2C88D0E36\
-E18EF7C38DAC80D3948E17ED63AFF3B3467866E3B89D09A81B3D16B52F6A3C7134D3C6F5123E9\
-F617E3145BBFBE9AFD0D6E437EA4FF6F04BC67C4F1458B4F0F47B64 - 1C2BBBB19B74E86FD32\
-9E8DB6A8C3B1B9986D57ED5419C2E855F7D5469E35E76334BB42F4C43E3F3A31B9697C171DAC4\
-D97935A7E1A14AD209D6CF811F55C6DB83AA9E6DFECFCD6669DED7171EE22A40C6181615CAF3F\
-5296964
-EOF
- if [ "0
-0" != "`cat tmp.bctest`" ]; then
- failure=SCOtest
- fi
- fi
-
-
- if [ "$failure" = none ]; then
- # bc works; now check if it knows the 'print' command.
- if [ "OK" = "`echo 'print \"OK\"' | $bc 2>/dev/null`" ]
- then
- echo "$bc"
- else
- echo "sed 's/print.*//' | $bc"
- fi
- exit 0
- fi
-
- echo "$bc does not work properly ('$failure' failed). Looking for another bc ..." >&2
- fi
-done
-
-echo "No working bc found. Consider installing GNU bc." >&2
-if [ "$1" = ignore ]; then
- echo "cat >/dev/null"
- exit 0
-fi
-exit 1
diff --git a/deps/openssl/openssl/test/bftest.c b/deps/openssl/openssl/test/bftest.c
index 78b1749a4d..eb8c15de7e 120000
--- a/deps/openssl/openssl/test/bftest.c
+++ b/deps/openssl/openssl/test/bftest.c
@@ -1 +1 @@
-../crypto/bf/bftest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/bf/bftest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/bntest.c b/deps/openssl/openssl/test/bntest.c
index 03f54a238e..1f781768a9 120000
--- a/deps/openssl/openssl/test/bntest.c
+++ b/deps/openssl/openssl/test/bntest.c
@@ -1 +1 @@
-../crypto/bn/bntest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/bn/bntest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/casttest.c b/deps/openssl/openssl/test/casttest.c
index ac7ede8d79..823c4bb36c 120000
--- a/deps/openssl/openssl/test/casttest.c
+++ b/deps/openssl/openssl/test/casttest.c
@@ -1 +1 @@
-../crypto/cast/casttest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/cast/casttest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/certs/pss1.pem b/deps/openssl/openssl/test/certs/pss1.pem
new file mode 100644
index 0000000000..29da71dae8
--- /dev/null
+++ b/deps/openssl/openssl/test/certs/pss1.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdjCCAjqgAwIBAgIJANcwZLyfEv7DMD4GCSqGSIb3DQEBCjAxoA0wCwYJYIZI
+AWUDBAIBoRowGAYJKoZIhvcNAQEIMAsGCWCGSAFlAwQCAaIEAgIA3jAnMSUwIwYD
+VQQDDBxUZXN0IEludmFsaWQgUFNTIGNlcnRpZmljYXRlMB4XDTE1MTEwNDE2MDIz
+NVoXDTE1MTIwNDE2MDIzNVowJzElMCMGA1UEAwwcVGVzdCBJbnZhbGlkIFBTUyBj
+ZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTaM7WH
+qVCAGAIA+zL1KWvvASTrhlq+1ePdO7wsrWX2KiYoTYrJYTnxhLnn0wrHqApt79nL
+IBG7cfShyZqFHOY/IzlYPMVt+gPo293gw96Fds5JBsjhjkyGnOyr9OUntFqvxDbT
+IIFU7o9IdxD4edaqjRv+fegVE+B79pDk4s0ujsk6dULtCg9Rst0ucGFo19mr+b7k
+dbfn8pZ72ZNDJPueVdrUAWw9oll61UcYfk75XdrLk6JlL41GrYHc8KlfXf43gGQq
+QfrpHkg4Ih2cI6Wt2nhFGAzrlcorzLliQIUJRIhM8h4IgDfpBpaPdVQLqS2pFbXa
+5eQjqiyJwak2vJ8CAwEAAaNQME4wHQYDVR0OBBYEFCt180N4oGUt5LbzBwQ4Ia+2
+4V97MB8GA1UdIwQYMBaAFCt180N4oGUt5LbzBwQ4Ia+24V97MAwGA1UdEwQFMAMB
+Af8wMQYJKoZIhvcNAQEKMCSgDTALBglghkgBZQMEAgGhDTALBgkqhkiG9w0BAQii
+BAICAN4DggEBAAjBtm90lGxgddjc4Xu/nbXXFHVs2zVcHv/mqOZoQkGB9r/BVgLb
+xhHrFZ2pHGElbUYPfifdS9ztB73e1d4J+P29o0yBqfd4/wGAc/JA8qgn6AAEO/Xn
+plhFeTRJQtLZVl75CkHXgUGUd3h+ADvKtcBuW9dSUncaUrgNKR8u/h/2sMG38RWY
+DzBddC/66YTa3r7KkVUfW7yqRQfELiGKdcm+bjlTEMsvS+EhHup9CzbpoCx2Fx9p
+NPtFY3yEObQhmL1JyoCRWqBE75GzFPbRaiux5UpEkns+i3trkGssZzsOuVqHNTNZ
+lC9+9hPHIoc9UMmAQNo1vGIW3NWVoeGbaJ8=
+-----END CERTIFICATE-----
diff --git a/deps/openssl/openssl/test/clienthellotest.c b/deps/openssl/openssl/test/clienthellotest.c
new file mode 120000
index 0000000000..ae25f16c43
--- /dev/null
+++ b/deps/openssl/openssl/test/clienthellotest.c
@@ -0,0 +1 @@
+openssl-1.0.2e/../ssl/clienthellotest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/constant_time_test.c b/deps/openssl/openssl/test/constant_time_test.c
index 519f2f3511..4f9a6aa6e5 120000
--- a/deps/openssl/openssl/test/constant_time_test.c
+++ b/deps/openssl/openssl/test/constant_time_test.c
@@ -1 +1 @@
-../crypto/constant_time_test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/constant_time_test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/destest.c b/deps/openssl/openssl/test/destest.c
index 5988c7303a..fd77cd5ca8 120000
--- a/deps/openssl/openssl/test/destest.c
+++ b/deps/openssl/openssl/test/destest.c
@@ -1 +1 @@
-../crypto/des/destest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/des/destest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/dhtest.c b/deps/openssl/openssl/test/dhtest.c
index 9a67f91628..7c3e64db0d 120000
--- a/deps/openssl/openssl/test/dhtest.c
+++ b/deps/openssl/openssl/test/dhtest.c
@@ -1 +1 @@
-../crypto/dh/dhtest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/dh/dhtest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/dsatest.c b/deps/openssl/openssl/test/dsatest.c
index 16a1b5a349..1a181759a1 120000
--- a/deps/openssl/openssl/test/dsatest.c
+++ b/deps/openssl/openssl/test/dsatest.c
@@ -1 +1 @@
-../crypto/dsa/dsatest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/dsa/dsatest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/ecdhtest.c b/deps/openssl/openssl/test/ecdhtest.c
index 206d98686d..5e24a98a67 120000
--- a/deps/openssl/openssl/test/ecdhtest.c
+++ b/deps/openssl/openssl/test/ecdhtest.c
@@ -1 +1 @@
-../crypto/ecdh/ecdhtest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/ecdh/ecdhtest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/ecdsatest.c b/deps/openssl/openssl/test/ecdsatest.c
index 441082ba24..c2bbe4f91b 120000
--- a/deps/openssl/openssl/test/ecdsatest.c
+++ b/deps/openssl/openssl/test/ecdsatest.c
@@ -1 +1 @@
-../crypto/ecdsa/ecdsatest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/ecdsa/ecdsatest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/ectest.c b/deps/openssl/openssl/test/ectest.c
index df1831f812..e25805f3e0 120000
--- a/deps/openssl/openssl/test/ectest.c
+++ b/deps/openssl/openssl/test/ectest.c
@@ -1 +1 @@
-../crypto/ec/ectest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/ec/ectest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/enginetest.c b/deps/openssl/openssl/test/enginetest.c
index 5c74a6f418..7eb1831ea3 120000
--- a/deps/openssl/openssl/test/enginetest.c
+++ b/deps/openssl/openssl/test/enginetest.c
@@ -1 +1 @@
-../crypto/engine/enginetest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/engine/enginetest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/evp_extra_test.c b/deps/openssl/openssl/test/evp_extra_test.c
index 2f2a8f7b08..7be69e4f57 120000
--- a/deps/openssl/openssl/test/evp_extra_test.c
+++ b/deps/openssl/openssl/test/evp_extra_test.c
@@ -1 +1 @@
-../crypto/evp/evp_extra_test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/evp/evp_extra_test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/evp_test.c b/deps/openssl/openssl/test/evp_test.c
index 074162812a..969b2dfaca 120000
--- a/deps/openssl/openssl/test/evp_test.c
+++ b/deps/openssl/openssl/test/evp_test.c
@@ -1 +1 @@
-../crypto/evp/evp_test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/evp/evp_test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/exptest.c b/deps/openssl/openssl/test/exptest.c
index 50ccf71cbb..cea2f17017 120000
--- a/deps/openssl/openssl/test/exptest.c
+++ b/deps/openssl/openssl/test/exptest.c
@@ -1 +1 @@
-../crypto/bn/exptest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/bn/exptest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/heartbeat_test.c b/deps/openssl/openssl/test/heartbeat_test.c
index 79576fd5aa..836fb8a6d7 120000
--- a/deps/openssl/openssl/test/heartbeat_test.c
+++ b/deps/openssl/openssl/test/heartbeat_test.c
@@ -1 +1 @@
-../ssl/heartbeat_test.c \ No newline at end of file
+openssl-1.0.2e/../ssl/heartbeat_test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/hmactest.c b/deps/openssl/openssl/test/hmactest.c
index 353ee2c7f9..a646bcdd43 120000
--- a/deps/openssl/openssl/test/hmactest.c
+++ b/deps/openssl/openssl/test/hmactest.c
@@ -1 +1 @@
-../crypto/hmac/hmactest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/hmac/hmactest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/ideatest.c b/deps/openssl/openssl/test/ideatest.c
index a9bfb3d480..ba9935815c 120000
--- a/deps/openssl/openssl/test/ideatest.c
+++ b/deps/openssl/openssl/test/ideatest.c
@@ -1 +1 @@
-../crypto/idea/ideatest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/idea/ideatest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/jpaketest.c b/deps/openssl/openssl/test/jpaketest.c
index 49f44f8b69..1b5e260fab 120000
--- a/deps/openssl/openssl/test/jpaketest.c
+++ b/deps/openssl/openssl/test/jpaketest.c
@@ -1 +1 @@
-dummytest.c \ No newline at end of file
+openssl-1.0.2e/dummytest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/md2test.c b/deps/openssl/openssl/test/md2test.c
index 49f44f8b69..1b5e260fab 120000
--- a/deps/openssl/openssl/test/md2test.c
+++ b/deps/openssl/openssl/test/md2test.c
@@ -1 +1 @@
-dummytest.c \ No newline at end of file
+openssl-1.0.2e/dummytest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/md4test.c b/deps/openssl/openssl/test/md4test.c
index 1509be911d..88e2eb82c7 120000
--- a/deps/openssl/openssl/test/md4test.c
+++ b/deps/openssl/openssl/test/md4test.c
@@ -1 +1 @@
-../crypto/md4/md4test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/md4/md4test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/md5test.c b/deps/openssl/openssl/test/md5test.c
index 20f4aaf0a4..62779aedff 120000
--- a/deps/openssl/openssl/test/md5test.c
+++ b/deps/openssl/openssl/test/md5test.c
@@ -1 +1 @@
-../crypto/md5/md5test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/md5/md5test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/mdc2test.c b/deps/openssl/openssl/test/mdc2test.c
index c4ffe4835e..89c5faf92e 120000
--- a/deps/openssl/openssl/test/mdc2test.c
+++ b/deps/openssl/openssl/test/mdc2test.c
@@ -1 +1 @@
-../crypto/mdc2/mdc2test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/mdc2/mdc2test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/randtest.c b/deps/openssl/openssl/test/randtest.c
index a2b107a2b0..7094f41bd0 120000
--- a/deps/openssl/openssl/test/randtest.c
+++ b/deps/openssl/openssl/test/randtest.c
@@ -1 +1 @@
-../crypto/rand/randtest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/rand/randtest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/rc2test.c b/deps/openssl/openssl/test/rc2test.c
index 5c53ad984a..4101b4f4e8 120000
--- a/deps/openssl/openssl/test/rc2test.c
+++ b/deps/openssl/openssl/test/rc2test.c
@@ -1 +1 @@
-../crypto/rc2/rc2test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/rc2/rc2test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/rc4test.c b/deps/openssl/openssl/test/rc4test.c
index 061ac37734..d3c90794b3 120000
--- a/deps/openssl/openssl/test/rc4test.c
+++ b/deps/openssl/openssl/test/rc4test.c
@@ -1 +1 @@
-../crypto/rc4/rc4test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/rc4/rc4test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/rc5test.c b/deps/openssl/openssl/test/rc5test.c
index 49f44f8b69..1b5e260fab 120000
--- a/deps/openssl/openssl/test/rc5test.c
+++ b/deps/openssl/openssl/test/rc5test.c
@@ -1 +1 @@
-dummytest.c \ No newline at end of file
+openssl-1.0.2e/dummytest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/rmdtest.c b/deps/openssl/openssl/test/rmdtest.c
index ce66460654..1744939e0f 120000
--- a/deps/openssl/openssl/test/rmdtest.c
+++ b/deps/openssl/openssl/test/rmdtest.c
@@ -1 +1 @@
-../crypto/ripemd/rmdtest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/ripemd/rmdtest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/rsa_test.c b/deps/openssl/openssl/test/rsa_test.c
index aaea20d98b..4bc7c76809 120000
--- a/deps/openssl/openssl/test/rsa_test.c
+++ b/deps/openssl/openssl/test/rsa_test.c
@@ -1 +1 @@
-../crypto/rsa/rsa_test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/rsa/rsa_test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/sha1test.c b/deps/openssl/openssl/test/sha1test.c
index 8d66e9ee4c..172c67cc8d 120000
--- a/deps/openssl/openssl/test/sha1test.c
+++ b/deps/openssl/openssl/test/sha1test.c
@@ -1 +1 @@
-../crypto/sha/sha1test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/sha/sha1test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/sha256t.c b/deps/openssl/openssl/test/sha256t.c
index 952a508676..2f356c921b 120000
--- a/deps/openssl/openssl/test/sha256t.c
+++ b/deps/openssl/openssl/test/sha256t.c
@@ -1 +1 @@
-../crypto/sha/sha256t.c \ No newline at end of file
+openssl-1.0.2e/../crypto/sha/sha256t.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/sha512t.c b/deps/openssl/openssl/test/sha512t.c
index c80d152f1b..fbab5ab848 120000
--- a/deps/openssl/openssl/test/sha512t.c
+++ b/deps/openssl/openssl/test/sha512t.c
@@ -1 +1 @@
-../crypto/sha/sha512t.c \ No newline at end of file
+openssl-1.0.2e/../crypto/sha/sha512t.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/shatest.c b/deps/openssl/openssl/test/shatest.c
index 43cfda78fb..b0bffa74fd 120000
--- a/deps/openssl/openssl/test/shatest.c
+++ b/deps/openssl/openssl/test/shatest.c
@@ -1 +1 @@
-../crypto/sha/shatest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/sha/shatest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/srptest.c b/deps/openssl/openssl/test/srptest.c
index 9534868267..4f8b8f850c 120000
--- a/deps/openssl/openssl/test/srptest.c
+++ b/deps/openssl/openssl/test/srptest.c
@@ -1 +1 @@
-../crypto/srp/srptest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/srp/srptest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/ssltest.c b/deps/openssl/openssl/test/ssltest.c
index 40191f0da2..9ee1c02f16 120000
--- a/deps/openssl/openssl/test/ssltest.c
+++ b/deps/openssl/openssl/test/ssltest.c
@@ -1 +1 @@
-../ssl/ssltest.c \ No newline at end of file
+openssl-1.0.2e/../ssl/ssltest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/tx509 b/deps/openssl/openssl/test/tx509
index 0ce3b5223c..77f5cacfca 100644
--- a/deps/openssl/openssl/test/tx509
+++ b/deps/openssl/openssl/test/tx509
@@ -74,5 +74,12 @@ if [ $? != 0 ]; then exit 1; fi
cmp x509-f.p x509-ff.p3
if [ $? != 0 ]; then exit 1; fi
+echo "Parsing test certificates"
+
+$cmd -in certs/pss1.pem -text -noout >/dev/null
+if [ $? != 0 ]; then exit 1; fi
+
+echo OK
+
/bin/rm -f x509-f.* x509-ff.* x509-fff.*
exit 0
diff --git a/deps/openssl/openssl/test/v3nametest.c b/deps/openssl/openssl/test/v3nametest.c
index 1d209eb963..05ac941158 120000
--- a/deps/openssl/openssl/test/v3nametest.c
+++ b/deps/openssl/openssl/test/v3nametest.c
@@ -1 +1 @@
-../crypto/x509v3/v3nametest.c \ No newline at end of file
+openssl-1.0.2e/../crypto/x509v3/v3nametest.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/verify_extra_test.c b/deps/openssl/openssl/test/verify_extra_test.c
index 11d837c6fa..0d94843bbf 120000
--- a/deps/openssl/openssl/test/verify_extra_test.c
+++ b/deps/openssl/openssl/test/verify_extra_test.c
@@ -1 +1 @@
-../crypto/x509/verify_extra_test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/x509/verify_extra_test.c \ No newline at end of file
diff --git a/deps/openssl/openssl/test/wp_test.c b/deps/openssl/openssl/test/wp_test.c
index 81b2021f39..a0a05266b1 120000
--- a/deps/openssl/openssl/test/wp_test.c
+++ b/deps/openssl/openssl/test/wp_test.c
@@ -1 +1 @@
-../crypto/whrlpool/wp_test.c \ No newline at end of file
+openssl-1.0.2e/../crypto/whrlpool/wp_test.c \ No newline at end of file