From 242690ab2a8e991b85b4735c4e0bac0ec7bd3481 Mon Sep 17 00:00:00 2001 From: djm <> Date: Fri, 1 Oct 2010 22:54:19 +0000 Subject: import OpenSSL-1.0.0a --- src/lib/libssl/test/Makefile | 537 +++++++++++--------------------------- src/lib/libssl/test/maketests.com | 205 ++++++++------- src/lib/libssl/test/tcrl.com | 4 +- src/lib/libssl/test/testca.com | 38 +-- src/lib/libssl/test/testenc.com | 5 +- src/lib/libssl/test/testgen.com | 4 +- src/lib/libssl/test/tests.com | 46 +++- src/lib/libssl/test/testss.com | 4 +- src/lib/libssl/test/testssl.com | 4 +- src/lib/libssl/test/testtsa.com | 248 ++++++++++++++++++ src/lib/libssl/test/tpkcs7.com | 4 +- src/lib/libssl/test/tpkcs7d.com | 4 +- src/lib/libssl/test/treq.com | 4 +- src/lib/libssl/test/trsa.com | 4 +- src/lib/libssl/test/tsid.com | 4 +- src/lib/libssl/test/tverify.com | 78 ++++-- src/lib/libssl/test/tx509.com | 4 +- 17 files changed, 636 insertions(+), 561 deletions(-) create mode 100644 src/lib/libssl/test/testtsa.com (limited to 'src/lib/libssl/test') diff --git a/src/lib/libssl/test/Makefile b/src/lib/libssl/test/Makefile index 228ee368cd..3912f82427 100644 --- a/src/lib/libssl/test/Makefile +++ b/src/lib/libssl/test/Makefile @@ -5,7 +5,7 @@ DIR= test TOP= .. CC= cc -INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) -I$(TOP)/fips +INCLUDES= -I$(TOP) -I../include $(KRB5_INCLUDES) CFLAG= -g MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) PERL= perl @@ -27,7 +27,6 @@ DLIBCRYPTO= ../libcrypto.a DLIBSSL= ../libssl.a LIBCRYPTO= -L.. -lcrypto LIBSSL= -L.. -lssl -LIBFIPS= -L.. -lfips BNTEST= bntest ECTEST= ectest @@ -45,6 +44,7 @@ MD2TEST= md2test MD4TEST= md4test MD5TEST= md5test HMACTEST= hmactest +WPTEST= wp_test RC2TEST= rc2test RC4TEST= rc4test RC5TEST= rc5test @@ -60,66 +60,40 @@ RSATEST= rsa_test ENGINETEST= enginetest EVPTEST= evp_test IGETEST= igetest -FIPS_SHATEST= fips_shatest -FIPS_DESTEST= fips_desmovs -FIPS_RANDTEST= fips_randtest -FIPS_AESTEST= fips_aesavs -FIPS_HMACTEST= fips_hmactest -FIPS_RSAVTEST= fips_rsavtest -FIPS_RSASTEST= fips_rsastest -FIPS_RSAGTEST= fips_rsagtest -FIPS_DSATEST= fips_dsatest -FIPS_DSSVS= fips_dssvs -FIPS_RNGVS= fips_rngvs -FIPS_TEST_SUITE=fips_test_suite +JPAKETEST= jpaketest +ASN1TEST= asn1test TESTS= alltests EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) \ - $(MD2TEST)$(EXE_EXT) $(MD4TEST)$(EXE_EXT) $(MD5TEST)$(EXE_EXT) $(HMACTEST)$(EXE_EXT) \ + $(MD2TEST)$(EXE_EXT) $(MD4TEST)$(EXE_EXT) $(MD5TEST)$(EXE_EXT) $(HMACTEST)$(EXE_EXT) $(WPTEST)$(EXE_EXT) \ $(RC2TEST)$(EXE_EXT) $(RC4TEST)$(EXE_EXT) $(RC5TEST)$(EXE_EXT) \ $(DESTEST)$(EXE_EXT) $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT) \ $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \ $(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) \ - $(FIPS_SHATEST)$(EXE_EXT) $(FIPS_DESTEST)$(EXE_EXT) \ - $(FIPS_RANDTEST)$(EXE_EXT) $(FIPS_AESTEST)$(EXE_EXT) \ - $(FIPS_HMACTEST)$(EXE_EXT) $(FIPS_RSAVTEST)$(EXE_EXT) \ - $(FIPS_RSASTEST)$(EXE_EXT) $(FIPS_RSAGTEST)$(EXE_EXT) \ - $(FIPS_DSSVS)$(EXE_EXT) $(FIPS_DSATEST)$(EXE_EXT) \ - $(FIPS_RNGVS)$(EXE_EXT) $(FIPS_TEST_SUITE)$(EXE_EXT) jpaketest$(EXE_EXT) + $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) \ + $(ASN1TEST)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \ $(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \ - $(HMACTEST).o \ + $(HMACTEST).o $(WPTEST).o \ $(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \ $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(SHA256TEST).o $(SHA512TEST).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 \ - $(FIPS_SHATEST).o $(FIPS_DESTEST).o $(FIPS_RANDTEST).o \ - $(FIPS_AESTEST).o $(FIPS_HMACTEST).o $(FIPS_RSAVTEST).o \ - $(FIPS_RSASTEST).o $(FIPS_RSAGTEST).o \ - $(FIPS_DSSVS).o $(FIPS_DSATEST).o $(FIPS_RNGVS).o $(FIPS_TEST_SUITE).o \ - jpaketest.o - + $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ - $(HMACTEST).c \ + $(HMACTEST).c $(WPTEST).c \ $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \ $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \ $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \ - $(EVPTEST).c $(IGETEST).c \ - $(FIPS_SHATEST).c $(FIPS_DESTEST).c $(FIPS_RANDTEST).c \ - $(FIPS_AESTEST).c $(FIPS_HMACTEST).c $(FIPS_RSAVTEST).c \ - $(FIPS_RSASTEST).c $(FIPS_RSAGTEST).c \ - $(FIPS_DSSVS).c $(FIPS_DSATEST).c $(FIPS_RNGVS).c $(FIPS_TEST_SUITE).c \ - jpaketest.c + $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(ASN1TEST).c EXHEADER= HEADER= $(EXHEADER) @@ -156,12 +130,13 @@ apps: alltests: \ test_des test_idea test_sha test_md4 test_md5 test_hmac \ - test_md2 test_mdc2 \ + test_md2 test_mdc2 test_wp \ test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast test_aes \ test_rand test_bn test_ec test_ecdsa test_ecdh \ 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_ige test_jpake + test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ + test_jpake test_cms test_evp: ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt @@ -177,9 +152,6 @@ test_sha: ../util/shlib_wrap.sh ./$(SHA1TEST) ../util/shlib_wrap.sh ./$(SHA256TEST) ../util/shlib_wrap.sh ./$(SHA512TEST) - if [ -n "$(FIPSCANLIB)" ]; then \ - ../util/shlib_wrap.sh ./$(FIPS_SHATEST) < SHAmix.r | diff -w SHAmix.x - ; \ - fi test_mdc2: ../util/shlib_wrap.sh ./$(MDC2TEST) @@ -193,6 +165,9 @@ test_md4: test_hmac: ../util/shlib_wrap.sh ./$(HMACTEST) +test_wp: + ../util/shlib_wrap.sh ./$(WPTEST) + test_md2: ../util/shlib_wrap.sh ./$(MD2TEST) @@ -216,12 +191,9 @@ test_rc5: test_rand: ../util/shlib_wrap.sh ./$(RANDTEST) - if [ -n "$(FIPSCANLIB)" ]; then \ - ../util/shlib_wrap.sh ./$(FIPS_RANDTEST); \ - fi test_enc: - sh ./testenc + @sh ./testenc test_x509: echo test normal x509v1 certificate @@ -283,9 +255,6 @@ test_dsa: @echo "Generate a set of DSA parameters" ../util/shlib_wrap.sh ./$(DSATEST) ../util/shlib_wrap.sh ./$(DSATEST) -app2_1 - if [ -n "$(FIPSCANLIB)" ]; then \ - ../util/shlib_wrap.sh ./$(FIPS_DSATEST); \ - fi test_gen: @echo "Generate and verify a certificate request" @@ -305,9 +274,6 @@ test_engine: test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \ intP1.ss intP2.ss @echo "test SSL protocol" - @if [ -n "$(FIPSCANLIB)" ]; then \ - sh ./testfipsssl keyU.ss certU.ss certCA.ss; \ - fi ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist @sh ./testssl keyU.ss certU.ss certCA.ss @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss @@ -325,13 +291,24 @@ test_aes: #$(AESTEST) # @echo "test Rijndael" # ../util/shlib_wrap.sh ./$(AESTEST) +test_tsa: + @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \ + echo "skipping testtsa test -- requires RSA"; \ + else \ + sh ./testtsa; \ + fi + test_ige: $(IGETEST)$(EXE_EXT) @echo "Test IGE mode" ../util/shlib_wrap.sh ./$(IGETEST) -test_jpake: jpaketest$(EXE_EXT) +test_jpake: $(JPAKETEST)$(EXE_EXT) @echo "Test JPAKE" - ../util/shlib_wrap.sh ./jpaketest + ../util/shlib_wrap.sh ./$(JPAKETEST) + +test_cms: + @echo "CMS consistency test" + $(PERL) cms-test.pl lint: lint -DLINT $(INCLUDES) $(SRC)>fluff @@ -346,9 +323,11 @@ depend: dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new mv -f Makefile.new $(MAKEFILE) + rm -f $(SRC) $(SHA256TEST).c $(SHA512TEST).c evptests.txt newkey.pem testkey.pem \ + testreq.pem clean: - rm -f .rnd tmp.bntest tmp.bctest *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest + rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest $(DLIBSSL): (cd ..; $(MAKE) DIRS=ssl all) @@ -360,7 +339,6 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ shlib_target="$(SHLIB_TARGET)"; \ fi; \ LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ - [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ $(MAKE) -f $(TOP)/Makefile.shared -e \ APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ @@ -396,71 +374,6 @@ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) @target=$(SHA512TEST); $(BUILD_CMD) -FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - fi; \ - if [ "$(FIPSCANLIB)" = "libfips" ]; then \ - LIBRARIES="-L$(TOP) -lfips"; \ - elif [ -n "$(FIPSCANLIB)" ]; then \ - FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ - LIBRARIES="$${FIPSLIBDIR:-$(TOP)/fips/}fipscanister.o"; \ - else \ - LIBRARIES="$(LIBCRYPTO)"; \ - fi; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \ - shlib_target="$(SHLIB_TARGET)"; \ - fi; \ - LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \ - if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \ - FIPSLD_CC=$(CC); CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \ - fi; \ - [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \ - $(MAKE) -f $(TOP)/Makefile.shared -e \ - CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \ - LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \ - link_app.$${shlib_target} - -$(FIPS_SHATEST)$(EXE_EXT): $(FIPS_SHATEST).o $(DLIBCRYPTO) - @target=$(FIPS_SHATEST); $(FIPS_BUILD_CMD) - -$(FIPS_AESTEST)$(EXE_EXT): $(FIPS_AESTEST).o $(DLIBCRYPTO) - @target=$(FIPS_AESTEST); $(FIPS_BUILD_CMD) - -$(FIPS_DESTEST)$(EXE_EXT): $(FIPS_DESTEST).o $(DLIBCRYPTO) - @target=$(FIPS_DESTEST); $(FIPS_BUILD_CMD) - -$(FIPS_HMACTEST)$(EXE_EXT): $(FIPS_HMACTEST).o $(DLIBCRYPTO) - @target=$(FIPS_HMACTEST); $(FIPS_BUILD_CMD) - -$(FIPS_RANDTEST)$(EXE_EXT): $(FIPS_RANDTEST).o $(DLIBCRYPTO) - @target=$(FIPS_RANDTEST); $(FIPS_BUILD_CMD) - -$(FIPS_RSAVTEST)$(EXE_EXT): $(FIPS_RSAVTEST).o $(DLIBCRYPTO) - @target=$(FIPS_RSAVTEST); $(FIPS_BUILD_CMD) - -$(FIPS_RSASTEST)$(EXE_EXT): $(FIPS_RSASTEST).o $(DLIBCRYPTO) - @target=$(FIPS_RSASTEST); $(FIPS_BUILD_CMD) - -$(FIPS_RSAGTEST)$(EXE_EXT): $(FIPS_RSAGTEST).o $(DLIBCRYPTO) - @target=$(FIPS_RSAGTEST); $(FIPS_BUILD_CMD) - -$(FIPS_DSATEST)$(EXE_EXT): $(FIPS_DSATEST).o $(DLIBCRYPTO) - @target=$(FIPS_DSATEST); $(FIPS_BUILD_CMD) - -$(FIPS_DSSVS)$(EXE_EXT): $(FIPS_DSSVS).o $(DLIBCRYPTO) - @target=$(FIPS_DSSVS); $(FIPS_BUILD_CMD) - -$(FIPS_RNGVS)$(EXE_EXT): $(FIPS_RNGVS).o $(DLIBCRYPTO) - @target=$(FIPS_RNGVS); $(FIPS_BUILD_CMD) - -$(FIPS_TEST_SUITE)$(EXE_EXT): $(FIPS_TEST_SUITE).o $(DLIBCRYPTO) - @target=$(FIPS_TEST_SUITE); $(FIPS_BUILD_CMD) - $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) @target=$(RMDTEST); $(BUILD_CMD) @@ -476,6 +389,9 @@ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) @target=$(HMACTEST); $(BUILD_CMD) +$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) + @target=$(WPTEST); $(BUILD_CMD) + $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) @target=$(RC2TEST); $(BUILD_CMD) @@ -507,7 +423,7 @@ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) @target=$(METHTEST); $(BUILD_CMD) $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) - @target=$(SSLTEST); $(FIPS_CRYPTO_BUILD_CMD) + @target=$(SSLTEST); $(BUILD_CMD) $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) @target=$(ENGINETEST); $(BUILD_CMD) @@ -524,8 +440,11 @@ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) @target=$(IGETEST); $(BUILD_CMD) -jpaketest$(EXE_EXT): jpaketest.o $(DLIBCRYPTO) - @target=jpaketest; $(BUILD_CMD) +$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) + @target=$(JPAKETEST); $(BUILD_CMD) + +$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) + @target=$(ASN1TEST); $(BUILD_CMD) #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @@ -538,10 +457,22 @@ jpaketest$(EXE_EXT): jpaketest.o $(DLIBCRYPTO) # fi dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) - @target=dummytest$; $(BUILD_CMD) + @target=dummytest; $(BUILD_CMD) # DO NOT DELETE THIS LINE -- make depend depends on it. +asn1test.o: ../include/openssl/asn1.h ../include/openssl/asn1_mac.h +asn1test.o: ../include/openssl/bio.h ../include/openssl/buffer.h +asn1test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h +asn1test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h +asn1test.o: ../include/openssl/ecdsa.h ../include/openssl/evp.h +asn1test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +asn1test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +asn1test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +asn1test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +asn1test.o: ../include/openssl/sha.h ../include/openssl/stack.h +asn1test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +asn1test.o: ../include/openssl/x509_vfy.h asn1test.c bftest.o: ../e_os.h ../include/openssl/blowfish.h ../include/openssl/e_os2.h bftest.o: ../include/openssl/opensslconf.h bftest.c bntest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h @@ -550,15 +481,14 @@ bntest.o: ../include/openssl/crypto.h ../include/openssl/dh.h bntest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h bntest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h bntest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -bntest.o: ../include/openssl/evp.h ../include/openssl/fips.h -bntest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -bntest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -bntest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -bntest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -bntest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -bntest.o: ../include/openssl/sha.h ../include/openssl/stack.h -bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -bntest.o: ../include/openssl/x509_vfy.h bntest.c +bntest.o: ../include/openssl/evp.h ../include/openssl/lhash.h +bntest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +bntest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +bntest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +bntest.o: ../include/openssl/rand.h ../include/openssl/rsa.h +bntest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +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 destest.o: ../include/openssl/des.h ../include/openssl/des_old.h @@ -597,54 +527,53 @@ ecdsatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h ecdsatest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ecdsatest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ecdsatest.o: ../include/openssl/err.h ../include/openssl/evp.h -ecdsatest.o: ../include/openssl/fips.h ../include/openssl/lhash.h -ecdsatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ecdsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ecdsatest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -ecdsatest.o: ../include/openssl/rand.h ../include/openssl/safestack.h -ecdsatest.o: ../include/openssl/sha.h ../include/openssl/stack.h -ecdsatest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -ecdsatest.o: ../include/openssl/x509_vfy.h ecdsatest.c +ecdsatest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +ecdsatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +ecdsatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +ecdsatest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +ecdsatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ecdsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +ecdsatest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +ecdsatest.o: ecdsatest.c ectest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ectest.o: ../include/openssl/bn.h ../include/openssl/buffer.h ectest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h ectest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h ectest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h ectest.o: ../include/openssl/err.h ../include/openssl/evp.h -ectest.o: ../include/openssl/fips.h ../include/openssl/lhash.h -ectest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -ectest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -ectest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -ectest.o: ../include/openssl/rand.h ../include/openssl/safestack.h -ectest.o: ../include/openssl/sha.h ../include/openssl/stack.h -ectest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -ectest.o: ../include/openssl/x509_vfy.h ectest.c +ectest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +ectest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +ectest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +ectest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +ectest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +ectest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +ectest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ectest.c enginetest.o: ../include/openssl/asn1.h ../include/openssl/bio.h enginetest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h enginetest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h enginetest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h -enginetest.o: ../include/openssl/evp.h ../include/openssl/fips.h -enginetest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -enginetest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -enginetest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -enginetest.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -enginetest.o: ../include/openssl/sha.h ../include/openssl/stack.h -enginetest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -enginetest.o: ../include/openssl/x509_vfy.h enginetest.c +enginetest.o: ../include/openssl/evp.h ../include/openssl/lhash.h +enginetest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +enginetest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +enginetest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h +enginetest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +enginetest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +enginetest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +enginetest.o: enginetest.c evp_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h evp_test.o: ../include/openssl/buffer.h ../include/openssl/conf.h evp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h evp_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h evp_test.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h -evp_test.o: ../include/openssl/fips.h ../include/openssl/lhash.h -evp_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -evp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -evp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -evp_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h -evp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -evp_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h evp_test.c +evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h +evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +evp_test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h +evp_test.o: ../include/openssl/sha.h ../include/openssl/stack.h +evp_test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h +evp_test.o: ../include/openssl/x509_vfy.h evp_test.c exptest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h @@ -652,186 +581,14 @@ exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h exptest.o: ../include/openssl/symhacks.h exptest.c -fips_aesavs.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/aes.h -fips_aesavs.o: ../include/openssl/asn1.h ../include/openssl/bio.h -fips_aesavs.o: ../include/openssl/bn.h ../include/openssl/crypto.h -fips_aesavs.o: ../include/openssl/e_os2.h ../include/openssl/err.h -fips_aesavs.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_aesavs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -fips_aesavs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -fips_aesavs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_aesavs.o: ../include/openssl/safestack.h ../include/openssl/stack.h -fips_aesavs.o: ../include/openssl/symhacks.h fips_aesavs.c -fips_desmovs.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/asn1.h -fips_desmovs.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_desmovs.o: ../include/openssl/crypto.h ../include/openssl/des.h -fips_desmovs.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h -fips_desmovs.o: ../include/openssl/err.h ../include/openssl/evp.h -fips_desmovs.o: ../include/openssl/fips.h ../include/openssl/lhash.h -fips_desmovs.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -fips_desmovs.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips_desmovs.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -fips_desmovs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -fips_desmovs.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h -fips_desmovs.o: fips_desmovs.c -fips_dsatest.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/asn1.h -fips_dsatest.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_dsatest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -fips_dsatest.o: ../include/openssl/des.h ../include/openssl/des_old.h -fips_dsatest.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h -fips_dsatest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -fips_dsatest.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h -fips_dsatest.o: ../include/openssl/err.h ../include/openssl/evp.h -fips_dsatest.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h -fips_dsatest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -fips_dsatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -fips_dsatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_dsatest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -fips_dsatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -fips_dsatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -fips_dsatest.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h -fips_dsatest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -fips_dsatest.o: fips_dsatest.c -fips_dssvs.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_dssvs.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_dssvs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -fips_dssvs.o: ../include/openssl/e_os2.h ../include/openssl/err.h -fips_dssvs.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_dssvs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -fips_dssvs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -fips_dssvs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_dssvs.o: ../include/openssl/safestack.h ../include/openssl/stack.h -fips_dssvs.o: ../include/openssl/symhacks.h fips_dssvs.c -fips_hmactest.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_hmactest.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_hmactest.o: ../include/openssl/buffer.h ../include/openssl/conf.h -fips_hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -fips_hmactest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -fips_hmactest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -fips_hmactest.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_hmactest.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -fips_hmactest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -fips_hmactest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips_hmactest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -fips_hmactest.o: ../include/openssl/safestack.h ../include/openssl/sha.h -fips_hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -fips_hmactest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -fips_hmactest.o: ../include/openssl/x509v3.h fips_hmactest.c -fips_randtest.o: ../e_os.h ../fips/fips_utl.h ../include/openssl/bio.h -fips_randtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h -fips_randtest.o: ../include/openssl/des.h ../include/openssl/des_old.h -fips_randtest.o: ../include/openssl/e_os2.h ../include/openssl/err.h -fips_randtest.o: ../include/openssl/fips_rand.h ../include/openssl/lhash.h -fips_randtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips_randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h -fips_randtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -fips_randtest.o: ../include/openssl/symhacks.h ../include/openssl/ui.h -fips_randtest.o: ../include/openssl/ui_compat.h fips_randtest.c -fips_rngvs.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_rngvs.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_rngvs.o: ../include/openssl/buffer.h ../include/openssl/conf.h -fips_rngvs.o: ../include/openssl/crypto.h ../include/openssl/des.h -fips_rngvs.o: ../include/openssl/des_old.h ../include/openssl/dsa.h -fips_rngvs.o: ../include/openssl/e_os2.h ../include/openssl/ec.h -fips_rngvs.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h -fips_rngvs.o: ../include/openssl/err.h ../include/openssl/evp.h -fips_rngvs.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h -fips_rngvs.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -fips_rngvs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -fips_rngvs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_rngvs.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h -fips_rngvs.o: ../include/openssl/safestack.h ../include/openssl/sha.h -fips_rngvs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -fips_rngvs.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h -fips_rngvs.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h -fips_rngvs.o: ../include/openssl/x509v3.h fips_rngvs.c -fips_rsagtest.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_rsagtest.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_rsagtest.o: ../include/openssl/buffer.h ../include/openssl/conf.h -fips_rsagtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -fips_rsagtest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -fips_rsagtest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -fips_rsagtest.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_rsagtest.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -fips_rsagtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -fips_rsagtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips_rsagtest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -fips_rsagtest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -fips_rsagtest.o: ../include/openssl/sha.h ../include/openssl/stack.h -fips_rsagtest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -fips_rsagtest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h -fips_rsagtest.o: fips_rsagtest.c -fips_rsastest.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_rsastest.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_rsastest.o: ../include/openssl/buffer.h ../include/openssl/conf.h -fips_rsastest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -fips_rsastest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -fips_rsastest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -fips_rsastest.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_rsastest.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -fips_rsastest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -fips_rsastest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips_rsastest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -fips_rsastest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -fips_rsastest.o: ../include/openssl/sha.h ../include/openssl/stack.h -fips_rsastest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -fips_rsastest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h -fips_rsastest.o: fips_rsastest.c -fips_rsavtest.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_rsavtest.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_rsavtest.o: ../include/openssl/buffer.h ../include/openssl/conf.h -fips_rsavtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -fips_rsavtest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -fips_rsavtest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -fips_rsavtest.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_rsavtest.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -fips_rsavtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -fips_rsavtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips_rsavtest.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -fips_rsavtest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -fips_rsavtest.o: ../include/openssl/sha.h ../include/openssl/stack.h -fips_rsavtest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -fips_rsavtest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h -fips_rsavtest.o: fips_rsavtest.c -fips_shatest.o: ../fips/fips_utl.h ../include/openssl/asn1.h -fips_shatest.o: ../include/openssl/bio.h ../include/openssl/bn.h -fips_shatest.o: ../include/openssl/buffer.h ../include/openssl/conf.h -fips_shatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -fips_shatest.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -fips_shatest.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -fips_shatest.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_shatest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -fips_shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -fips_shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_shatest.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -fips_shatest.o: ../include/openssl/sha.h ../include/openssl/stack.h -fips_shatest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -fips_shatest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h -fips_shatest.o: fips_shatest.c -fips_test_suite.o: ../fips/fips_utl.h ../include/openssl/aes.h -fips_test_suite.o: ../include/openssl/asn1.h ../include/openssl/bio.h -fips_test_suite.o: ../include/openssl/bn.h ../include/openssl/crypto.h -fips_test_suite.o: ../include/openssl/des.h ../include/openssl/des_old.h -fips_test_suite.o: ../include/openssl/dh.h ../include/openssl/dsa.h -fips_test_suite.o: ../include/openssl/e_os2.h ../include/openssl/err.h -fips_test_suite.o: ../include/openssl/evp.h ../include/openssl/fips.h -fips_test_suite.o: ../include/openssl/hmac.h ../include/openssl/lhash.h -fips_test_suite.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -fips_test_suite.o: ../include/openssl/opensslconf.h -fips_test_suite.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_test_suite.o: ../include/openssl/rand.h ../include/openssl/rsa.h -fips_test_suite.o: ../include/openssl/safestack.h ../include/openssl/sha.h -fips_test_suite.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -fips_test_suite.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h -fips_test_suite.o: fips_test_suite.c hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -hmactest.o: ../include/openssl/evp.h ../include/openssl/fips.h -hmactest.o: ../include/openssl/hmac.h ../include/openssl/md5.h -hmactest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -hmactest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -hmactest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -hmactest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h hmactest.c +hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h +hmactest.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h +hmactest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +hmactest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +hmactest.o: ../include/openssl/safestack.h ../include/openssl/stack.h +hmactest.o: ../include/openssl/symhacks.h hmactest.c ideatest.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/idea.h ideatest.o: ../include/openssl/opensslconf.h ideatest.c igetest.o: ../include/openssl/aes.h ../include/openssl/e_os2.h @@ -842,35 +599,34 @@ jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h jpaketest.o: ../include/openssl/safestack.h ../include/openssl/stack.h jpaketest.o: ../include/openssl/symhacks.h jpaketest.c -md2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -md2test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md2test.o: ../include/openssl/evp.h ../include/openssl/fips.h -md2test.o: ../include/openssl/md2.h ../include/openssl/obj_mac.h -md2test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +md2test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h +md2test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h md2test.o: ../include/openssl/symhacks.h md2test.c md4test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h md4test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md4test.o: ../include/openssl/evp.h ../include/openssl/fips.h -md4test.o: ../include/openssl/md4.h ../include/openssl/obj_mac.h -md4test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -md4test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -md4test.o: ../include/openssl/safestack.h ../include/openssl/stack.h -md4test.o: ../include/openssl/symhacks.h md4test.c +md4test.o: ../include/openssl/evp.h ../include/openssl/md4.h +md4test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +md4test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +md4test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +md4test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md4test.c md5test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h md5test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -md5test.o: ../include/openssl/evp.h ../include/openssl/fips.h -md5test.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -md5test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -md5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -md5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h -md5test.o: ../include/openssl/symhacks.h md5test.c -mdc2test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h -mdc2test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -mdc2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -mdc2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h -mdc2test.o: ../include/openssl/symhacks.h mdc2test.c +md5test.o: ../include/openssl/evp.h ../include/openssl/md5.h +md5test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +md5test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +md5test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +md5test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h md5test.c +mdc2test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h +mdc2test.o: ../include/openssl/crypto.h ../include/openssl/des.h +mdc2test.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h +mdc2test.o: ../include/openssl/evp.h ../include/openssl/mdc2.h +mdc2test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +mdc2test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +mdc2test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +mdc2test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +mdc2test.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h mdc2test.c randtest.o: ../e_os.h ../include/openssl/e_os2.h randtest.o: ../include/openssl/opensslconf.h ../include/openssl/ossl_typ.h randtest.o: ../include/openssl/rand.h randtest.c @@ -886,12 +642,11 @@ rc5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h rc5test.o: ../include/openssl/symhacks.h rc5test.c rmdtest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h rmdtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -rmdtest.o: ../include/openssl/evp.h ../include/openssl/fips.h -rmdtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -rmdtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -rmdtest.o: ../include/openssl/ossl_typ.h ../include/openssl/ripemd.h -rmdtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h -rmdtest.o: ../include/openssl/symhacks.h rmdtest.c +rmdtest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h +rmdtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +rmdtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +rmdtest.o: ../include/openssl/ripemd.h ../include/openssl/safestack.h +rmdtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h rmdtest.c rsa_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/err.h @@ -902,20 +657,18 @@ rsa_test.o: ../include/openssl/safestack.h ../include/openssl/stack.h rsa_test.o: ../include/openssl/symhacks.h rsa_test.c sha1test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h sha1test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -sha1test.o: ../include/openssl/evp.h ../include/openssl/fips.h -sha1test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -sha1test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -sha1test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -sha1test.o: ../include/openssl/sha.h ../include/openssl/stack.h -sha1test.o: ../include/openssl/symhacks.h sha1test.c +sha1test.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h +sha1test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +sha1test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +sha1test.o: ../include/openssl/safestack.h ../include/openssl/sha.h +sha1test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h sha1test.c shatest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h shatest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -shatest.o: ../include/openssl/evp.h ../include/openssl/fips.h -shatest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -shatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -shatest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h -shatest.o: ../include/openssl/sha.h ../include/openssl/stack.h -shatest.o: ../include/openssl/symhacks.h shatest.c +shatest.o: ../include/openssl/evp.h ../include/openssl/obj_mac.h +shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h +shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h ssltest.o: ../include/openssl/comp.h ../include/openssl/conf.h @@ -924,13 +677,12 @@ ssltest.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h ssltest.o: ../include/openssl/e_os2.h ../include/openssl/ec.h ssltest.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h ssltest.o: ../include/openssl/engine.h ../include/openssl/err.h -ssltest.o: ../include/openssl/evp.h ../include/openssl/fips.h -ssltest.o: ../include/openssl/hmac.h ../include/openssl/kssl.h -ssltest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -ssltest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -ssltest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -ssltest.o: ../include/openssl/pem.h ../include/openssl/pem2.h -ssltest.o: ../include/openssl/pkcs7.h ../include/openssl/pq_compat.h +ssltest.o: ../include/openssl/evp.h ../include/openssl/hmac.h +ssltest.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +ssltest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +ssltest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h ssltest.o: ../include/openssl/sha.h ../include/openssl/ssl.h @@ -939,3 +691,8 @@ ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssltest.o: ../include/openssl/x509v3.h ssltest.c +wp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h +wp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +wp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +wp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +wp_test.o: ../include/openssl/whrlpool.h wp_test.c diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com index 14cbf06088..ca072f1d11 100644 --- a/src/lib/libssl/test/maketests.com +++ b/src/lib/libssl/test/maketests.com @@ -12,9 +12,9 @@ $! "test" programs for the different types of encryption for OpenSSL. $! It was written so it would try to determine what "C" compiler to $! use or you can specify which "C" compiler to use. $! -$! The test "executeables" will be placed in a directory called -$! [.xxx.EXE.TEST] where "xxx" denotes AXP or VAX depending on your machines -$! architecture. +$! The test "executables" will be placed in a directory called +$! [.xxx.EXE.TEST] where "xxx" denotes ALPHA, IA64, or VAX, depending +$! on your machine architecture. $! $! Specify DEBUG or NODEBUG P1 to compile with or without debugger $! information. @@ -44,24 +44,19 @@ $ TCPIP_LIB = "" $! $! Check Which Architecture We Are Using. $! -$ IF (F$GETSYI("CPU").GE.128) -$ THEN -$! -$! The Architecture Is AXP. -$! -$ ARCH := AXP -$! -$! Else... -$! -$ ELSE -$! -$! The Architecture Is VAX. -$! -$ ARCH := VAX +$ if (f$getsyi( "HW_MODEL") .lt. 1024) +$ then +$ arch = "VAX" +$ else +$ arch = "" +$ arch = arch+ f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if (arch .eqs. "") then arch = "UNK" +$ endif $! -$! End The Architecture Check. +$! Define The OBJ and EXE Directories (EXE before CHECK_OPTIONS). $! -$ ENDIF +$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.TEST] +$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.TEST] $! $! Check To Make Sure We Have Valid Command Line Parameters. $! @@ -73,7 +68,7 @@ $ GOSUB INITIALISE $! $! Tell The User What Kind of Machine We Run On. $! -$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine." +$ WRITE SYS$OUTPUT "Compiling On ''ARCH'." $! $! Define The CRYPTO-LIB We Are To Use. $! @@ -83,39 +78,12 @@ $! Define The SSL We Are To Use. $! $ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB $! -$! Define The OBJ Directory. -$! -$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.TEST] -$! -$! Check To See If The Architecture Specific OBJ Directory Exists. -$! -$ IF (F$PARSE(OBJ_DIR).EQS."") -$ THEN -$! -$! The EXE Directory Dosen't Exist, So Create It. -$! -$ CREATE/DIRECTORY 'OBJ_DIR' -$! -$! End The Architecture Specific OBJ Directory Check. -$! -$ ENDIF +$! Create the OBJ and EXE Directories, if needed. $! -$! Define The EXE Directory. -$! -$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.TEST] -$! -$! Check To See If The Architecture Specific EXE Directory Exists. -$! -$ IF (F$PARSE(EXE_DIR).EQS."") -$ THEN -$! -$! The EXE Directory Dosen't Exist, So Create It. -$! -$ CREATE/DIRECTORY 'EXE_DIR' -$! -$! End The Architecture Specific EXE Directory Check. -$! -$ ENDIF +$ IF (F$PARSE(OBJ_DIR).EQS."") THEN - + CREATE /DIRECTORY 'OBJ_DIR' +$ IF (F$PARSE(EXE_DIR).EQS."") THEN - + CREATE /DIRECTORY 'EXE_DIR' $! $! Check To See If We Have The Proper Libraries. $! @@ -126,20 +94,59 @@ $! $ GOSUB CHECK_OPT_FILE $! $! Define The TEST Files. +$! NOTE: Some might think this list ugly. However, it's made this way to +$! reflect the EXE variable in Makefile as closely as possible, +$! thereby making it fairly easy to verify that the lists are the same. $! $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ - - "MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ - + "MD2TEST,MD4TEST,MD5TEST,HMACTEST,WP_TEST,"+ - "RC2TEST,RC4TEST,RC5TEST,"+ - "DESTEST,SHATEST,SHA1TEST,SHA256T,SHA512T,"+ - "MDC2TEST,RMDTEST,"+ - "RANDTEST,DHTEST,ENGINETEST,"+ - "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ - - "EVP_TEST" + "EVP_TEST,JPAKETEST" +$! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well? +$! +$! Additional directory information. +$ T_D_BNTEST := [-.crypto.bn] +$ T_D_ECTEST := [-.crypto.ec] +$ T_D_ECDSATEST := [-.crypto.ecdsa] +$ T_D_ECDHTEST := [-.crypto.ecdh] +$ T_D_IDEATEST := [-.crypto.idea] +$ T_D_MD2TEST := [-.crypto.md2] +$ T_D_MD4TEST := [-.crypto.md4] +$ T_D_MD5TEST := [-.crypto.md5] +$ T_D_HMACTEST := [-.crypto.hmac] +$ T_D_WP_TEST := [-.crypto.whrlpool] +$ T_D_RC2TEST := [-.crypto.rc2] +$ T_D_RC4TEST := [-.crypto.rc4] +$ T_D_RC5TEST := [-.crypto.rc5] +$ T_D_DESTEST := [-.crypto.des] +$ T_D_SHATEST := [-.crypto.sha] +$ T_D_SHA1TEST := [-.crypto.sha] +$ T_D_SHA256T := [-.crypto.sha] +$ T_D_SHA512T := [-.crypto.sha] +$ T_D_MDC2TEST := [-.crypto.mdc2] +$ T_D_RMDTEST := [-.crypto.ripemd] +$ T_D_RANDTEST := [-.crypto.rand] +$ T_D_DHTEST := [-.crypto.dh] +$ T_D_ENGINETEST := [-.crypto.engine] +$ T_D_BFTEST := [-.crypto.bf] +$ T_D_CASTTEST := [-.crypto.cast] +$ T_D_SSLTEST := [-.ssl] +$ T_D_EXPTEST := [-.crypto.bn] +$ T_D_DSATEST := [-.crypto.dsa] +$ T_D_RSA_TEST := [-.crypto.rsa] +$ T_D_EVP_TEST := [-.crypto.evp] +$ T_D_JPAKETEST := [-.crypto.jpake] +$ T_D_IGETEST := [-.test] +$! $ TCPIP_PROGRAMS = ",," $ IF COMPILER .EQS. "VAXC" THEN - TCPIP_PROGRAMS = ",SSLTEST," $! -$! Define A File Counter And Set It To "0". +$! Define A File Counter And Set It To "0". $! $ FILE_COUNTER = 0 $! @@ -161,7 +168,7 @@ $ FILE_COUNTER = FILE_COUNTER + 1 $! $! Create The Source File Name. $! -$ SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME + ".C" +$ SOURCE_FILE = "SYS$DISK:" + T_D_'FILE_NAME' + FILE_NAME + ".C" $! $! Create The Object File Name. $! @@ -195,7 +202,7 @@ $! $! Compile The File. $! $ ON ERROR THEN GOTO NEXT_FILE -$ CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE' +$ CC /OBJECT='OBJECT_FILE' 'SOURCE_FILE' $ ON WARNING THEN GOTO NEXT_FILE $! $! Check If What We Are About To Compile Works Without A TCP/IP Library. @@ -205,7 +212,8 @@ $ THEN $! $! Inform The User That A TCP/IP Library Is Needed To Compile This Program. $! -$ WRITE SYS$OUTPUT FILE_NAME," Needs A TCP/IP Library. Can't Link. Skipping..." +$ WRITE SYS$OUTPUT - + FILE_NAME," Needs A TCP/IP Library. Can't Link. Skipping..." $ GOTO NEXT_FILE $! $! End The TCP/IP Library Check. @@ -220,10 +228,12 @@ $ THEN $! $! Don't Link With The RSAREF Routines And TCP/IP Library. $! -$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' - +$ LINK /'DEBUGGER' /'TRACEBACK' /EXECTABLE = 'EXE_FILE' - 'OBJECT_FILE', - - 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, - - 'TCPIP_LIB','OPT_FILE'/OPTION + 'SSL_LIB' /LIBRARY, - + 'CRYPTO_LIB' /LIBRARY, - + 'TCPIP_LIB', - + 'OPT_FILE' /OPTIONS $! $! Else... $! @@ -231,10 +241,11 @@ $ ELSE $! $! Don't Link With The RSAREF Routines And Link With A TCP/IP Library. $! -$ LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' - +$ LINK /'DEBUGGER' /'TRACEBACK' /EXECUTABLE = 'EXE_FILE' - 'OBJECT_FILE', - - 'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, - - 'OPT_FILE'/OPTION + 'SSL_LIB' /LIBRARY, - + 'CRYPTO_LIB' /LIBRARY, - + 'OPT_FILE' /OPTIONS $! $! End The TCP/IP Library Check. $! @@ -273,10 +284,10 @@ $! $ CREATE 'OPT_FILE' $DECK ! -! Default System Options File To Link Agianst +! Default System Options File To Link Against ! The Sharable VAX C Runtime Library. ! -SYS$SHARE:VAXCRTL.EXE/SHARE +SYS$SHARE:VAXCRTL.EXE /SHAREABLE $EOD $! $! End The Option File Check. @@ -305,8 +316,8 @@ $DECK ! Default System Options File To Link Agianst ! The Sharable C Runtime Library. ! -GNU_CC:[000000]GCCLIB/LIBRARY -SYS$SHARE:VAXCRTL/SHARE +GNU_CC:[000000]GCCLIB.OLB /LIBRARY +SYS$SHARE:VAXCRTL.EXE /SHAREABLE $EOD $! $! End The Option File Check. @@ -327,7 +338,7 @@ $! $ IF (F$SEARCH(OPT_FILE).EQS."") $ THEN $! -$! Figure Out If We Need An AXP Or A VAX Linker Option File. +$! Figure Out If We Need A non-VAX Or A VAX Linker Option File. $! $ IF (ARCH.EQS."VAX") $ THEN @@ -340,26 +351,26 @@ $DECK ! Default System Options File To Link Agianst ! The Sharable DEC C Runtime Library. ! -SYS$SHARE:DECC$SHR.EXE/SHARE +SYS$SHARE:DECC$SHR.EXE /SHAREABLE $EOD $! $! Else... $! $ ELSE $! -$! Create The AXP Linker Option File. +$! Create The non-VAX Linker Option File. $! $ CREATE 'OPT_FILE' $DECK ! -! Default System Options File For AXP To Link Agianst +! Default System Options File For non-VAX To Link Agianst ! The Sharable C Runtime Library. ! -SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE -SYS$SHARE:CMA$OPEN_RTL/SHARE +SYS$SHARE:CMA$OPEN_LIB_SHR.EXE /SHAREABLE +SYS$SHARE:CMA$OPEN_RTL.EXE /SHAREABLE $EOD $! -$! End The VAX/AXP DEC C Option File Check. +$! End The DEC C Option File Check. $! $ ENDIF $! @@ -511,7 +522,7 @@ $ ELSE $! $! Check To See If We Have VAXC Or DECC. $! -$ IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."") +$ IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."") $ THEN $! $! Looks Like DECC, Set To Use DECC. @@ -614,14 +625,14 @@ $! Use DECC... $! $ CC = "CC" $ IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" - - THEN CC = "CC/DECC" -$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + - - "/NOLIST/PREFIX=ALL" + - + THEN CC = "CC /DECC" +$ CC = CC + "/''CC_OPTIMIZE' /''DEBUGGER' /STANDARD=ANSI89" + - + "/NOLIST /PREFIX=ALL" + - "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS $! $! Define The Linker Options File Name. $! -$ OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT" +$ OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT" $! $! End DECC Check. $! @@ -643,23 +654,23 @@ $! $! Compile Using VAXC. $! $ CC = "CC" -$ IF ARCH.EQS."AXP" +$ IF ARCH.NES."VAX" $ THEN -$ WRITE SYS$OUTPUT "There is no VAX C on Alpha!" +$ WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!" $ EXIT $ ENDIF -$ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC" -$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + - +$ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC /VAXC" +$ CC = CC + "/''CC_OPTIMIZE' /''DEBUGGER' /NOLIST" + - "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS $ CCDEFS = CCDEFS + ",""VAXC""" $! $! Define As SYS$COMMON:[SYSLIB] $! -$ DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB] +$ DEFINE /NOLOG SYS SYS$COMMON:[SYSLIB] $! $! Define The Linker Options File Name. $! -$ OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT" +$ OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT" $! $! End VAXC Check $! @@ -680,12 +691,12 @@ $ WRITE SYS$OUTPUT "Using GNU 'C' Compiler." $! $! Use GNU C... $! -$ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + - +$ CC = "GCC /NOCASE_HACK /''GCC_OPTIMIZE' /''DEBUGGER' /NOLIST" + - "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS $! $! Define The Linker Options File Name. $! -$ OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT" +$ OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT" $! $! End The GNU C Check. $! @@ -715,7 +726,7 @@ $ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS $! $! Show user the result $! -$ WRITE/SYMBOL SYS$OUTPUT "Main Compiling Command: ",CC +$ WRITE /SYMBOL SYS$OUTPUT "Main Compiling Command: ", CC $! $! Else The User Entered An Invalid Arguement. $! @@ -749,7 +760,7 @@ $ THEN $! $! Set the library to use SOCKETSHR $! -$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT" +$ TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT /OPTIONS" $! $! Done with SOCKETSHR $! @@ -760,7 +771,7 @@ $! $ IF P3.EQS."MULTINET" $ THEN $! -$! Set the library to use UXC emulation. +$! Set the library to use UCX emulation. $! $ P3 = "UCX" $! @@ -775,13 +786,13 @@ $ THEN $! $! Set the library to use UCX. $! -$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT" +$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT /OPTIONS" $ IF F$TRNLNM("UCX$IPC_SHR") .NES. "" $ THEN -$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT" +$ TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT /OPTIONS" $ ELSE $ IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN - - TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT" + TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT /OPTIONS" $ ENDIF $! $! Done with UCX @@ -795,7 +806,7 @@ $ THEN $! $! Set the library to use TCPIP (post UCX). $! -$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT" +$ TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT /OPTIONS" $! $! Done with TCPIP $! @@ -893,7 +904,7 @@ $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]" $! $! Set up the logical name OPENSSL to point at the include directory $! -$ DEFINE OPENSSL/NOLOG '__INCLUDE' +$ DEFINE OPENSSL /NOLOG '__INCLUDE' $! $! Done $! @@ -907,7 +918,7 @@ $ IF __SAVE_OPENSSL .EQS. "" $ THEN $ DEASSIGN OPENSSL $ ELSE -$ DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL' +$ DEFINE /NOLOG OPENSSL '__SAVE_OPENSSL' $ ENDIF $! $! Done diff --git a/src/lib/libssl/test/tcrl.com b/src/lib/libssl/test/tcrl.com index 86bf9735aa..1f606eb850 100644 --- a/src/lib/libssl/test/tcrl.com +++ b/src/lib/libssl/test/tcrl.com @@ -1,7 +1,9 @@ $! TCRL.COM -- Tests crl keys $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ cmd := mcr 'exe_dir'openssl crl diff --git a/src/lib/libssl/test/testca.com b/src/lib/libssl/test/testca.com index c670f2bf5f..ec7e56dad6 100644 --- a/src/lib/libssl/test/testca.com +++ b/src/lib/libssl/test/testca.com @@ -1,8 +1,9 @@ $! TESTCA.COM $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP -$ exe_dir := sys$disk:[-.'__arch'.exe.apps] +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ $ openssl := mcr 'exe_dir'openssl $ @@ -11,7 +12,7 @@ $ $ set noon $ if f$search("demoCA.dir") .nes. "" $ then -$ call deltree [.demoCA]*.* +$ @[-.util]deltree [.demoCA]*.* $ set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) demoCA.dir;* $ delete demoCA.dir;* $ endif @@ -38,7 +39,7 @@ $ @[-.apps]CA.com -verify newcert.pem $ if $severity .ne. 1 then exit 3 $ $ set noon -$ call deltree [.demoCA]*.* +$ @[-.util]deltree [.demoCA]*.* $ set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) demoCA.dir;* $ delete demoCA.dir;* $ if f$search("newcert.pem") .nes. "" then delete newcert.pem;* @@ -47,32 +48,3 @@ $ set on $! #usage: CA -newcert|-newreq|-newca|-sign|-verify $ $ exit -$ -$ deltree: subroutine ! P1 is a name of a directory -$ on control_y then goto dt_STOP -$ on warning then goto dt_exit -$ _dt_def = f$trnlnm("SYS$DISK")+f$directory() -$ if f$parse(p1) .eqs. "" then exit -$ set default 'f$parse(p1,,,"DEVICE")''f$parse(p1,,,"DIRECTORY")' -$ p1 = f$parse(p1,,,"NAME") + f$parse(p1,,,"TYPE") -$ _fp = f$parse(".DIR",p1) -$ dt_loop: -$ _f = f$search(_fp) -$ if _f .eqs. "" then goto dt_loopend -$ call deltree [.'f$parse(_f,,,"NAME")']*.* -$ goto dt_loop -$ dt_loopend: -$ _fp = f$parse(p1,".;*") -$ if f$search(_fp) .eqs. "" then goto dt_exit -$ set noon -$ set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) '_fp' -$ set on -$ delete/nolog '_fp' -$ dt_exit: -$ set default '_dt_def' -$ exit -$ dt_STOP: -$ set default '_dt_def' -$ stop/id="" -$ exit -$ endsubroutine diff --git a/src/lib/libssl/test/testenc.com b/src/lib/libssl/test/testenc.com index 5e6f521f9d..621d9a2126 100644 --- a/src/lib/libssl/test/testenc.com +++ b/src/lib/libssl/test/testenc.com @@ -1,8 +1,9 @@ $! TESTENC.COM -- Test encoding and decoding $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP -$ exe_dir := sys$disk:[-.'__arch'.exe.apps] +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ $ testsrc := makefile. $ test := p.txt diff --git a/src/lib/libssl/test/testgen.com b/src/lib/libssl/test/testgen.com index 5d28ebec72..a4bc574bec 100644 --- a/src/lib/libssl/test/testgen.com +++ b/src/lib/libssl/test/testgen.com @@ -1,7 +1,9 @@ $! TETSGEN.COM $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ T := testcert diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com index 88a33d0531..d151cd3955 100644 --- a/src/lib/libssl/test/tests.com +++ b/src/lib/libssl/test/tests.com @@ -6,11 +6,17 @@ $ __proc = f$element(0,";",f$environment("procedure")) $ __here = f$parse(f$parse("A.;",__proc) - "A.;","[]A.;") - "A.;" $ __save_default = f$environment("default") $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ texe_dir := sys$disk:[-.'__arch'.exe.test] $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ +$ sslroot = f$parse("sys$disk:[-.apps];",,,,"syntax_only") - "].;"+ ".]" +$ define /translation_attributes = concealed sslroot 'sslroot' +$ $ set default '__here' +$ $ on control_y then goto exit $ on error then goto exit $ @@ -18,14 +24,18 @@ $ if p1 .nes. "" $ then $ tests = p1 $ else +$! NOTE: This list reflects the list of dependencies following the +$! "alltests" target in Makefile. This should make it easy to see +$! if there's a difference that needs to be taken care of. $ tests := - test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,- - test_md2,test_mdc2,- - test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,- + test_md2,test_mdc2,test_wp,- + test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_aes,- test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,- 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_ige,test_jpake + test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,- + test_jpake,test_cms $ endif $ tests = f$edit(tests,"COLLAPSE") $ @@ -43,6 +53,7 @@ $ MD2TEST := md2test $ MD4TEST := md4test $ MD5TEST := md5test $ HMACTEST := hmactest +$ WPTEST := wp_test $ RC2TEST := rc2test $ RC4TEST := rc4test $ RC5TEST := rc5test @@ -93,6 +104,9 @@ $ return $ test_hmac: $ mcr 'texe_dir''hmactest' $ return +$ test_wp: +$ mcr 'texe_dir''wptest' +$ return $ test_md2: $ mcr 'texe_dir''md2test' $ return @@ -248,9 +262,22 @@ $ write sys$output "Generate and certify a test certificate via the 'ca' pro $ @testca.com $ endif $ return -$ test_rd: -$ write sys$output "test Rijndael" -$ !mcr 'texe_dir''rdtest' +$ test_aes: +$! write sys$output "test AES" +$! !mcr 'texe_dir''aestest' +$ return +$ test_tsa: +$ set noon +$ define/user sys$output nla0: +$ mcr 'exe_dir'openssl no-rsa +$ save_severity=$SEVERITY +$ set on +$ if save_severity +$ then +$ write sys$output "skipping testtsa.com test -- requires RSA" +$ else +$ @testtsa.com +$ endif $ return $ test_ige: $ write sys$output "Test IGE mode" @@ -260,8 +287,13 @@ $ test_jpake: $ write sys$output "Test JPAKE" $ mcr 'texe_dir''jpaketest' $ return +$ test_cms: +$ write sys$output "CMS consistency test" +$ perl CMS-TEST.PL +$ return $ $ $ exit: $ set default '__save_default' +$ deassign sslroot $ exit diff --git a/src/lib/libssl/test/testss.com b/src/lib/libssl/test/testss.com index 685ae5043d..6598106b09 100644 --- a/src/lib/libssl/test/testss.com +++ b/src/lib/libssl/test/testss.com @@ -1,7 +1,9 @@ $! TESTSS.COM $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ digest="-md5" diff --git a/src/lib/libssl/test/testssl.com b/src/lib/libssl/test/testssl.com index 26308f7715..9c83afba04 100644 --- a/src/lib/libssl/test/testssl.com +++ b/src/lib/libssl/test/testssl.com @@ -1,7 +1,9 @@ $! TESTSSL.COM $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ texe_dir := sys$disk:[-.'__arch'.exe.test] $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ diff --git a/src/lib/libssl/test/testtsa.com b/src/lib/libssl/test/testtsa.com new file mode 100644 index 0000000000..e3c586f14a --- /dev/null +++ b/src/lib/libssl/test/testtsa.com @@ -0,0 +1,248 @@ +$! +$! A few very basic tests for the 'ts' time stamping authority command. +$! +$ +$ __arch := VAX +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK +$ exe_dir := sys$disk:[-.'__arch'.exe.apps] +$ +$ openssl := mcr 'f$parse(exe_dir+"openssl.exe")' +$ OPENSSL_CONF := [-]CAtsa.cnf +$ ! Because that's what ../apps/CA.sh really looks at +$ SSLEAY_CONFIG = "-config " + OPENSSL_CONF +$ +$ error: +$ subroutine +$ write sys$error "TSA test failed!" +$ exit 3 +$ endsubroutine +$ +$ setup_dir: +$ subroutine +$ +$ if f$search("tsa.dir") .nes "" +$ then +$ @[-.util]deltree [.tsa]*.* +$ set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) tsa.dir;* +$ delete tsa.dir;* +$ endif +$ +$ create/dir [.tsa] +$ set default [.tsa] +$ endsubroutine +$ +$ clean_up_dir: +$ subroutine +$ +$ set default [-] +$ @[-.util]deltree [.tsa]*.* +$ set file/prot=(S:RWED,O:RWED,G:RWED,W:RWED) tsa.dir;* +$ delete tsa.dir;* +$ endsubroutine +$ +$ create_ca: +$ subroutine +$ +$ write sys$output "Creating a new CA for the TSA tests..." +$ TSDNSECT = "ts_ca_dn" +$ openssl req -new -x509 -nodes - + -out tsaca.pem -keyout tsacakey.pem +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ create_tsa_cert: +$ subroutine +$ +$ INDEX=p1 +$ EXT=p2 +$ TSDNSECT = "ts_cert_dn" +$ +$ openssl req -new - + -out tsa_req'INDEX'.pem -keyout tsa_key'INDEX'.pem +$ if $severity .ne. 1 then call error +$ +$ write sys$output "Using extension ''EXT'" +$ openssl x509 -req - + -in tsa_req'INDEX'.pem -out tsa_cert'INDEX'.pem - + "-CA" tsaca.pem "-CAkey" tsacakey.pem "-CAcreateserial" - + -extfile 'OPENSSL_CONF' -extensions "''EXT'" +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ print_request: +$ subroutine +$ +$ openssl ts -query -in 'p1' -text +$ endsubroutine +$ +$ create_time_stamp_request1: subroutine +$ +$ openssl ts -query -data [-]testtsa.com -policy tsa_policy1 - + -cert -out req1.tsq +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ create_time_stamp_request2: subroutine +$ +$ openssl ts -query -data [-]testtsa.com -policy tsa_policy2 - + -no_nonce -out req2.tsq +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ create_time_stamp_request3: subroutine +$ +$ openssl ts -query -data [-]CAtsa.cnf -no_nonce -out req3.tsq +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ print_response: +$ subroutine +$ +$ openssl ts -reply -in 'p1' -text +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ create_time_stamp_response: +$ subroutine +$ +$ openssl ts -reply -section 'p3' -queryfile 'p1' -out 'p2' +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ time_stamp_response_token_test: +$ subroutine +$ +$ RESPONSE2:='p2'.copy_tsr +$ TOKEN_DER:='p2'.token_der +$ openssl ts -reply -in 'p2' -out 'TOKEN_DER' -token_out +$ if $severity .ne. 1 then call error +$ openssl ts -reply -in 'TOKEN_DER' -token_in -out 'RESPONSE2' +$ if $severity .ne. 1 then call error +$ backup/compare 'RESPONSE2' 'p2' +$ if $severity .ne. 1 then call error +$ openssl ts -reply -in 'p2' -text -token_out +$ if $severity .ne. 1 then call error +$ openssl ts -reply -in 'TOKEN_DER' -token_in -text -token_out +$ if $severity .ne. 1 then call error +$ openssl ts -reply -queryfile 'p1' -text -token_out +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ verify_time_stamp_response: +$ subroutine +$ +$ openssl ts -verify -queryfile 'p1' -in 'p2' - + "-CAfile" tsaca.pem -untrusted tsa_cert1.pem +$ if $severity .ne. 1 then call error +$ openssl ts -verify -data 'p3' -in 'p2' - + "-CAfile" tsaca.pem -untrusted tsa_cert1.pem +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ verify_time_stamp_token: +$ subroutine +$ +$ ! create the token from the response first +$ openssl ts -reply -in 'p2' -out 'p2'.token -token_out +$ if $severity .ne. 1 then call error +$ openssl ts -verify -queryfile 'p1' -in 'p2'.token -token_in - + "-CAfile" tsaca.pem -untrusted tsa_cert1.pem +$ if $severity .ne. 1 then call error +$ openssl ts -verify -data 'p3' -in 'p2'.token -token_in - + "-CAfile" tsaca.pem -untrusted tsa_cert1.pem +$ if $severity .ne. 1 then call error +$ endsubroutine +$ +$ verify_time_stamp_response_fail: +$ subroutine +$ +$ openssl ts -verify -queryfile 'p1' -in 'p2' - + "-CAfile" tsaca.pem -untrusted tsa_cert1.pem +$ ! Checks if the verification failed, as it should have. +$ if $severity .eq. 1 then call error +$ write sys$output "Ok" +$ endsubroutine +$ +$ ! Main body ---------------------------------------------------------- +$ +$ write sys$output "Setting up TSA test directory..." +$ call setup_dir +$ +$ write sys$output "Creating CA for TSA tests..." +$ call create_ca +$ +$ write sys$output "Creating tsa_cert1.pem TSA server cert..." +$ call create_tsa_cert 1 "tsa_cert" +$ +$ write sys$output "Creating tsa_cert2.pem non-TSA server cert..." +$ call create_tsa_cert 2 "non_tsa_cert" +$ +$ write sys$output "Creating req1.req time stamp request for file testtsa..." +$ call create_time_stamp_request1 +$ +$ write sys$output "Printing req1.req..." +$ call print_request req1.tsq +$ +$ write sys$output "Generating valid response for req1.req..." +$ call create_time_stamp_response req1.tsq resp1.tsr tsa_config1 +$ +$ write sys$output "Printing response..." +$ call print_response resp1.tsr +$ +$ write sys$output "Verifying valid response..." +$ call verify_time_stamp_response req1.tsq resp1.tsr [-]testtsa.com +$ +$ write sys$output "Verifying valid token..." +$ call verify_time_stamp_token req1.tsq resp1.tsr [-]testtsa.com +$ +$ ! The tests below are commented out, because invalid signer certificates +$ ! can no longer be specified in the config file. +$ +$ ! write sys$output "Generating _invalid_ response for req1.req..." +$ ! call create_time_stamp_response req1.tsq resp1_bad.tsr tsa_config2 +$ +$ ! write sys$output "Printing response..." +$ ! call print_response resp1_bad.tsr +$ +$ ! write sys$output "Verifying invalid response, it should fail..." +$ ! call verify_time_stamp_response_fail req1.tsq resp1_bad.tsr +$ +$ write sys$output "Creating req2.req time stamp request for file testtsa..." +$ call create_time_stamp_request2 +$ +$ write sys$output "Printing req2.req..." +$ call print_request req2.tsq +$ +$ write sys$output "Generating valid response for req2.req..." +$ call create_time_stamp_response req2.tsq resp2.tsr tsa_config1 +$ +$ write sys$output "Checking '-token_in' and '-token_out' options with '-reply'..." +$ call time_stamp_response_token_test req2.tsq resp2.tsr +$ +$ write sys$output "Printing response..." +$ call print_response resp2.tsr +$ +$ write sys$output "Verifying valid response..." +$ call verify_time_stamp_response req2.tsq resp2.tsr [-]testtsa.com +$ +$ write sys$output "Verifying response against wrong request, it should fail..." +$ call verify_time_stamp_response_fail req1.tsq resp2.tsr +$ +$ write sys$output "Verifying response against wrong request, it should fail..." +$ call verify_time_stamp_response_fail req2.tsq resp1.tsr +$ +$ write sys$output "Creating req3.req time stamp request for file CAtsa.cnf..." +$ call create_time_stamp_request3 +$ +$ write sys$output "Printing req3.req..." +$ call print_request req3.tsq +$ +$ write sys$output "Verifying response against wrong request, it should fail..." +$ call verify_time_stamp_response_fail req3.tsq resp1.tsr +$ +$ write sys$output "Cleaning up..." +$ call clean_up_dir +$ +$ exit diff --git a/src/lib/libssl/test/tpkcs7.com b/src/lib/libssl/test/tpkcs7.com index 047834fba4..e107cc141a 100644 --- a/src/lib/libssl/test/tpkcs7.com +++ b/src/lib/libssl/test/tpkcs7.com @@ -1,7 +1,9 @@ $! TPKCS7.COM -- Tests pkcs7 keys $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ cmd := mcr 'exe_dir'openssl pkcs7 diff --git a/src/lib/libssl/test/tpkcs7d.com b/src/lib/libssl/test/tpkcs7d.com index 193bb72137..5ff653ccee 100644 --- a/src/lib/libssl/test/tpkcs7d.com +++ b/src/lib/libssl/test/tpkcs7d.com @@ -1,7 +1,9 @@ $! TPKCS7.COM -- Tests pkcs7 keys $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ cmd := mcr 'exe_dir'openssl pkcs7 diff --git a/src/lib/libssl/test/treq.com b/src/lib/libssl/test/treq.com index 5524e485ba..d2594be6a7 100644 --- a/src/lib/libssl/test/treq.com +++ b/src/lib/libssl/test/treq.com @@ -1,7 +1,9 @@ $! TREQ.COM -- Tests req keys $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ cmd := mcr 'exe_dir'openssl req -config [-.apps]openssl-vms.cnf diff --git a/src/lib/libssl/test/trsa.com b/src/lib/libssl/test/trsa.com index 6dbe59ef64..d3a8a605b7 100644 --- a/src/lib/libssl/test/trsa.com +++ b/src/lib/libssl/test/trsa.com @@ -1,7 +1,9 @@ $! TRSA.COM -- Tests rsa keys $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ set noon diff --git a/src/lib/libssl/test/tsid.com b/src/lib/libssl/test/tsid.com index abd1d4d737..267ace1135 100644 --- a/src/lib/libssl/test/tsid.com +++ b/src/lib/libssl/test/tsid.com @@ -1,7 +1,9 @@ $! TSID.COM -- Tests sid keys $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ cmd := mcr 'exe_dir'openssl sess_id diff --git a/src/lib/libssl/test/tverify.com b/src/lib/libssl/test/tverify.com index 021d701d79..01431f4aac 100644 --- a/src/lib/libssl/test/tverify.com +++ b/src/lib/libssl/test/tverify.com @@ -1,29 +1,63 @@ $! TVERIFY.COM $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK +$! +$ line_max = 255 ! Could be longer on modern non-VAX. +$ temp_file_name = "certs_"+ f$getjpi( "", "PID")+ ".tmp" $ exe_dir := sys$disk:[-.'__arch'.exe.apps] -$ -$ copy/concatenate [-.certs]*.pem certs.tmp -$ +$ cmd = "mcr ''exe_dir'openssl verify ""-CAfile"" ''temp_file_name'" +$ cmd_len = f$length( cmd) +$ pems = "[-.certs...]*.pem" +$! +$! Concatenate all the certificate files. +$! +$ copy /concatenate 'pems' 'temp_file_name' +$! +$! Loop through all the certificate files. +$! +$ args = "" $ old_f := -$ loop_certs: -$ verify := NO -$ more := YES -$ certs := -$ loop_certs2: -$ f = f$search("[-.certs]*.pem") -$ if f .nes. "" .and. f .nes. old_f +$ loop_file: +$ f = f$search( pems) +$ if ((f .nes. "") .and. (f .nes. old_f)) +$ then +$ old_f = f +$! +$! If this file name would over-extend the command line, then +$! run the command now. +$! +$ if (cmd_len+ f$length( args)+ 1+ f$length( f) .gt. line_max) +$ then +$ if (args .eqs. "") then goto disaster +$ 'cmd''args' +$ args = "" +$ endif +$! Add the next file to the argument list. +$ args = args+ " "+ f +$ else +$! No more files in the list +$ goto loop_file_end +$ endif +$ goto loop_file +$ loop_file_end: +$! +$! Run the command for any left-over arguments. +$! +$ if (args .nes. "") $ then -$ certs = certs + " [-.certs]" + f$parse(f,,,"NAME") + ".pem" -$ verify := YES -$ if f$length(certs) .lt. 180 then goto loop_certs2 -$ else -$ more := NO +$ 'cmd''args' $ endif -$ certs = certs - " " -$ -$ if verify then mcr 'exe_dir'openssl verify "-CAfile" certs.tmp 'certs' -$ if more then goto loop_certs -$ -$ delete certs.tmp;* +$! +$! Delete the temporary file. +$! +$ if (f$search( "''temp_file_name';*") .nes. "") then - + delete 'temp_file_name';* +$! +$ exit +$! +$ disaster: +$ write sys$output " Command line too long. Doomed." +$! diff --git a/src/lib/libssl/test/tx509.com b/src/lib/libssl/test/tx509.com index 7b2592f773..399eb01490 100644 --- a/src/lib/libssl/test/tx509.com +++ b/src/lib/libssl/test/tx509.com @@ -1,7 +1,9 @@ $! TX509.COM -- Tests x509 certificates $ $ __arch := VAX -$ if f$getsyi("cpu") .ge. 128 then __arch := AXP +$ if f$getsyi("cpu") .ge. 128 then - + __arch = f$edit( f$getsyi( "ARCH_NAME"), "UPCASE") +$ if __arch .eqs. "" then __arch := UNK $ exe_dir := sys$disk:[-.'__arch'.exe.apps] $ $ cmd := mcr 'exe_dir'openssl x509 -- cgit v1.2.3-55-g6feb