From c4962abc9b5940cdd3bed920b19334fd269df31b Mon Sep 17 00:00:00 2001 From: Mike DePaulo Date: Sat, 18 Oct 2014 19:59:47 -0400 Subject: Update openssl to version openssl-1.0.1j Conflicts: openssl/Makefile openssl/crypto/opensslconf.h --- openssl/test/Makefile | 22 +++++++++++++++++----- openssl/test/constant_time_test.c | 1 + openssl/test/maketests.com | 5 ++++- openssl/test/tests.com | 14 +++++++++++++- openssl/test/testssl | 6 ++++++ 5 files changed, 41 insertions(+), 7 deletions(-) create mode 120000 openssl/test/constant_time_test.c (limited to 'openssl/test') diff --git a/openssl/test/Makefile b/openssl/test/Makefile index 9fb62cf66..685a691af 100644 --- a/openssl/test/Makefile +++ b/openssl/test/Makefile @@ -63,7 +63,8 @@ IGETEST= igetest JPAKETEST= jpaketest SRPTEST= srptest ASN1TEST= asn1test -HEARTBEATTEST= heartbeat_test +HEARTBEATTEST= heartbeat_test +CONSTTIMETEST= constant_time_test TESTS= alltests @@ -75,7 +76,7 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST) $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \ $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \ $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \ - $(ASN1TEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) + $(ASN1TEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) $(CONSTTIMETEST)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) @@ -87,7 +88,8 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \ $(MDC2TEST).o $(RMDTEST).o \ $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \ - $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(HEARTBEATTEST).o + $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o \ + $(HEARTBEATTEST).o $(CONSTTIMETEST).o SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ @@ -97,7 +99,7 @@ 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 $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \ - $(HEARTBEATTEST).c + $(HEARTBEATTEST).c $(CONSTTIMETEST).c EXHEADER= HEADER= $(EXHEADER) @@ -140,7 +142,7 @@ alltests: \ test_enc test_x509 test_rsa test_crl test_sid \ test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ - test_jpake test_srp test_cms test_heartbeat + test_jpake test_srp test_cms test_heartbeat test_constant_time test_evp: ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt @@ -324,6 +326,10 @@ test_srp: $(SRPTEST)$(EXE_EXT) test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) ../util/shlib_wrap.sh ./$(HEARTBEATTEST) +test_constant_time: $(CONSTTIMETEST)$(EXE_EXT) + @echo "Test constant time utilites" + ../util/shlib_wrap.sh ./$(CONSTTIMETEST) + lint: lint -DLINT $(INCLUDES) $(SRC)>fluff @@ -485,6 +491,9 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) +$(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o + @target=$(CONSTTIMETEST) $(BUILD_CMD) + #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @@ -530,6 +539,9 @@ 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 +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 destest.o: ../include/openssl/des.h ../include/openssl/des_old.h destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h diff --git a/openssl/test/constant_time_test.c b/openssl/test/constant_time_test.c new file mode 120000 index 000000000..519f2f351 --- /dev/null +++ b/openssl/test/constant_time_test.c @@ -0,0 +1 @@ +../crypto/constant_time_test.c \ No newline at end of file diff --git a/openssl/test/maketests.com b/openssl/test/maketests.com index 9b64cba23..97e0c3bd3 100644 --- a/openssl/test/maketests.com +++ b/openssl/test/maketests.com @@ -6,6 +6,7 @@ $! A-Com Computing, Inc. $! byer@mail.all-net.net $! $! Changes by Richard Levitte +$! Zoltan Arpadffy $! $! This command files compiles and creates all the various different $! "test" programs for the different types of encryption for OpenSSL. @@ -147,7 +148,7 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ - "RANDTEST,DHTEST,ENGINETEST,"+ - "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ - "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ - - "ASN1TEST" + "ASN1TEST,HEARTBEAT_TEST,CONSTANT_TIME_TEST" $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well? $! $! Additional directory information. @@ -185,6 +186,8 @@ $ T_D_IGETEST := [-.test] $ T_D_JPAKETEST := [-.crypto.jpake] $ T_D_SRPTEST := [-.crypto.srp] $ T_D_ASN1TEST := [-.test] +$ T_D_HEARTBEAT_TEST := [-.ssl] +$ T_D_CONSTANT_TIME_TEST := [-.crypto] $! $ TCPIP_PROGRAMS = ",," $ IF COMPILER .EQS. "VAXC" THEN - diff --git a/openssl/test/tests.com b/openssl/test/tests.com index a840d5078..39a7bfa60 100644 --- a/openssl/test/tests.com +++ b/openssl/test/tests.com @@ -56,7 +56,7 @@ $ tests := - test_enc,test_x509,test_rsa,test_crl,test_sid,- test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,- - test_jpake,test_srp,test_cms + test_jpake,test_srp,test_cms,test_heartbeat,test_constant_time $ endif $ tests = f$edit(tests,"COLLAPSE") $ @@ -95,6 +95,8 @@ $ IGETEST := igetest $ JPAKETEST := jpaketest $ SRPTEST := srptest $ ASN1TEST := asn1test +$ HEARTBEATTEST := heartbeat_test +$ CONSTTIMETEST := constant_time_test $! $ tests_i = 0 $ loop_tests: @@ -366,10 +368,20 @@ $ test_srp: $ write sys$output "Test SRP" $ mcr 'texe_dir''srptest' $ return +$ test_heartbeat: +$ write sys$output "Test HEARTBEAT" +$ mcr 'texe_dir''heartbeattest' +$ return +$ test_constant_time: +$ write sys$output "Test constant time utilities" +$ mcr 'texe_dir''consttimetest' +$ return $ $ $ exit: +$ on error then goto exit2 ! In case openssl.exe didn't build. $ mcr 'exe_dir'openssl version -a +$ exit2: $ set default '__save_default' $ deassign sslroot $ exit diff --git a/openssl/test/testssl b/openssl/test/testssl index 4e8542b55..9fb89a3dd 100644 --- a/openssl/test/testssl +++ b/openssl/test/testssl @@ -173,6 +173,12 @@ else echo test tls1 with SRP via BIO pair $ssltest -bio_pair -tls1 -cipher SRP -srpuser test -srppass abc123 + + echo test tls1 with SRP auth + $ssltest -tls1 -cipher aSRP -srpuser test -srppass abc123 + + echo test tls1 with SRP auth via BIO pair + $ssltest -bio_pair -tls1 -cipher aSRP -srpuser test -srppass abc123 fi exit 0 -- cgit v1.2.3