Adjust unixly mk1mf after introduction of tkey
[openssl.git] / test / Makefile
index f4635b894795d78e3f5e062c5ad2278d83018489..6c973ad2b6103e03a0471ddbf24d19de3b3ca05c 100644 (file)
@@ -5,14 +5,10 @@
 DIR=           test
 TOP=           ..
 CC=            cc
-INCLUDES=      -I$(TOP) -I../include -I../crypto/include $(KRB5_INCLUDES) -I$(TOP)/fips
+INCLUDES=      -I$(TOP) -I../include -I../crypto/include -I$(TOP)/fips
 CFLAG=         -g
 MAKEDEPEND=    $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
 PERL=          perl
-# KRB5 stuff
-KRB5_INCLUDES=
-LIBKRB5=
-TEST=          igetest.c
 
 PEX_LIBS=
 EX_LIBS= #-lnsl -lsocket
@@ -30,6 +26,9 @@ LIBCRYPTO= -L.. -lcrypto
 LIBSSL= -L.. -lssl
 LIBFIPS= -L.. -lfips
 
+# Prefix for logline for each test
+START= @@@ START
+
 BNTEST=                bntest
 ECTEST=                ectest
 ECDSATEST=     ecdsatest
@@ -56,7 +55,6 @@ GOST2814789TEST=gost2814789test
 RANDTEST=      randtest
 DHTEST=                dhtest
 DSATEST=       dsatest
-METHTEST=      methtest
 SSLTEST=       ssltest
 RSATEST=       rsa_test
 ENGINETEST=    enginetest
@@ -111,10 +109,9 @@ SRC=       $(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
        $(GOST2814789TEST).c $(HEARTBEATTEST).c $(P5_CRPT2_TEST).c \
        $(CONSTTIMETEST).c testutil.c
 
-EXHEADER= 
-HEADER=        testutil.h $(EXHEADER)
+HEADER=        testutil.h
 
-ALL=    $(GENERAL) $(SRC) $(HEADER)
+ALL=   $(GENERAL) $(SRC) $(HEADER)
 
 top:
        (cd ..; $(MAKE) DIRS=$(DIR) TESTS=$(TESTS) all)
@@ -126,18 +123,12 @@ exe:      $(EXE) dummytest$(EXE_EXT)
 files:
        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
-links:
-
 generate: $(SRC)
 $(SRC):
        @sh $(TOP)/util/point.sh dummytest.c $@
 
 errors:
 
-install:
-
-uninstall:
-
 tags:
        ctags $(SRC)
 
@@ -159,210 +150,248 @@ alltests: \
        test_constant_time
 
 test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
 
 test_evp_extra: $(EVPEXTRATEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(EVPEXTRATEST)
 
 test_p5_crpt2: $(P5_CRPT2_TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(P5_CRPT2_TEST)
 
 test_des: $(DESTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(DESTEST)
 
 test_idea: $(IDEATEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(IDEATEST)
 
 test_sha: $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
+       @echo $(START) $@ -- sha1
        ../util/shlib_wrap.sh ./$(SHA1TEST)
+       @echo $(START) $@ -- sha256
        ../util/shlib_wrap.sh ./$(SHA256TEST)
+       @echo $(START) $@ -- sha512
        ../util/shlib_wrap.sh ./$(SHA512TEST)
 
 test_mdc2: $(MDC2TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MDC2TEST)
 
 test_md5: $(MD5TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MD5TEST)
 
 test_md4: $(MD4TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MD4TEST)
 
 test_hmac: $(HMACTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(HMACTEST)
 
 test_wp: $(WPTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(WPTEST)
 
 test_md2: $(MD2TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(MD2TEST)
 
 test_rmd: $(RMDTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RMDTEST)
 
 test_bf: $(BFTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(BFTEST)
 
 test_cast: $(CASTTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(CASTTEST)
 
 test_rc2: $(RC2TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RC2TEST)
 
 test_rc4: $(RC4TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RC4TEST)
 
 test_rc5: $(RC5TEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RC5TEST)
 
 test_rand: $(RANDTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RANDTEST)
 
 test_gost2814789: $(GOST2814789TEST)$(EXE_EXT)
+       @echo $(START) $@
        OPENSSL_ENGINES=../engines/ccgost ../util/shlib_wrap.sh ./$(GOST2814789TEST)
 
 test_enc: ../apps/openssl$(EXE_EXT) testenc
+       @echo $(START) $@
        @sh ./testenc
 
 test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pem
-       echo test normal x509v1 certificate
-       sh ./tx509 2>/dev/null
-       echo test first x509v3 certificate
-       sh ./tx509 v3-cert1.pem 2>/dev/null
-       echo test second x509v3 certificate
-       sh ./tx509 v3-cert2.pem 2>/dev/null
-
-test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) tkey testrsa.pem
-       @sh ./tkey testrsa.pem rsa private 2>/dev/null
-       @sh ./tkey testrsapub.pem rsa public 2>/dev/null
+       @echo $(START) $@ -- x509v1 certificate
+       sh ./tx509
+       @echo $(START) $@ -- first x509v3 certificate
+       sh ./tx509 v3-cert1.pem
+       @echo $(START) $@ -- second x509v3 certificate
+       sh ./tx509 v3-cert2.pem
+
+test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) tkey testrsa.pem testrsapub.pem
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(RSATEST)
+       @echo $(START) $@ -- private key
+       @sh ./tkey testrsa.pem rsa private
+       @echo $(START) $@ -- public public
+       @sh ./tkey testrsapub.pem rsa public
 
 test_crl: ../apps/openssl$(EXE_EXT) tcrl testcrl.pem
-       @sh ./tcrl 2>/dev/null
+       @echo $(START) $@
+       sh ./tcrl
 
 test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
-       @sh ./tsid 2>/dev/null
+       @echo $(START) $@
+       @sh ./tsid
 
 test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
-       @sh ./treq 2>/dev/null
-       @sh ./treq testreq2.pem 2>/dev/null
+       @echo $(START) $@
+       @sh ./treq
+       @echo $(START) $@ -- testreq2
+       @sh ./treq testreq2.pem
 
 test_pkcs7: ../apps/openssl$(EXE_EXT) tpkcs7 tpkcs7d testp7.pem pkcs7-1.pem
-       @sh ./tpkcs7 2>/dev/null
-       @sh ./tpkcs7d 2>/dev/null
+       @echo $(START) $@ -- pkcs7
+       @sh ./tpkcs7
+       @echo $(START) $@ -- pkcs7d
+       @sh ./tpkcs7d
 
 test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
-       @echo starting big number library test, could take a while...
+       @echo $(START) $@ -- could take  a while.
        @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
        @echo quit >>tmp.bntest
-       @echo "running bc"
+       @echo $(START) $@ -- running bc
        @<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'
+       @echo $(START) $@ -- $(EXPTEST)
        ../util/shlib_wrap.sh ./$(EXPTEST)
 
-test_ec: $(ECTEST)$(EXE_EXT) tkey testec-p256.pem
-       @echo 'test elliptic curves'
+test_ec: $(ECTEST)$(EXE_EXT) tkey testec-p256.pem testecpub-p256.pem
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ECTEST)
-       @sh ./tkey testec-p256.pem ec private 2>/dev/null
-       @sh ./tkey testecpub-p256.pem ec public 2>/dev/null
+       @echo $(START) $@ -- private
+       @sh ./tkey testec-p256.pem ec private
+       @echo $(START) $@ -- public
+       @sh ./tkey testecpub-p256.pem ec public
 
 test_ecdsa: $(ECDSATEST)$(EXE_EXT)
-       @echo 'test ecdsa'
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ECDSATEST)
 
 test_ecdh: $(ECDHTEST)$(EXE_EXT)
-       @echo 'test ecdh'
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ECDHTEST)
 
 test_verify: ../apps/openssl$(EXE_EXT)
-       @echo "The following command should have some OK's and some failures"
-       @echo "There are definitly a few expired certificates"
-       ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
+       @echo $(START) $@ -- expect some failures and expired certificates
+       OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
 
 test_dh: $(DHTEST)$(EXE_EXT)
-       @echo "Generate a set of DH parameters"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(DHTEST)
 
-test_dsa: $(DSATEST)$(EXE_EXT) tkey testdsa.pem
-       @echo "Generate a set of DSA parameters"
+test_dsa: $(DSATEST)$(EXE_EXT) tkey testdsa.pem testdsapub.pem
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(DSATEST)
+       @echo $(START) $@ -- app2_1
        ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
-       @sh ./tkey testdsa.pem dsa private 2>/dev/null
-       @sh ./tkey testdsapub.pem dsa public 2>/dev/null
+       @echo $(START) $@ -- private
+       @sh ./tkey testdsa.pem dsa private
+       @echo $(START) $@ -- public
+       @sh ./tkey testdsapub.pem dsa public
 
 test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
-       @echo "Generate and verify a certificate request"
+       @echo $(START) test_gen
        @sh ./testgen
 
 test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
                intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf \
                                    ../apps/openssl$(EXE_EXT)
-       @echo "Generate and certify a test certificate"
+       @echo $(START) test_ss
        @sh ./testss
        @cat certCA.ss certU.ss > intP1.ss
        @cat certCA.ss certU.ss certP1.ss > intP2.ss
 
 test_engine: $(ENGINETEST)$(EXE_EXT)
-       @echo "Manipulate the ENGINE structures"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(ENGINETEST)
 
 test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
                intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
                ../apps/server2.pem serverinfo.pem
-       @echo "test SSL protocol"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
+       @echo $(START) $@ -- key U
        @sh ./testssl keyU.ss certU.ss certCA.ss
+       @echo $(START) $@ -- key P1
        @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
+       @echo $(START) $@ -- key P2
        @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
 
 test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
-       @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-         echo "skipping CA.sh test -- requires RSA"; \
+       @if OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
+         echo SKIP $@ -- requires RSA; \
        else \
-         echo "Generate and certify a test certificate via the 'ca' program"; \
-         sh ./testca; \
+         echo $(START) $@; \
+         sh ./testca $(PERL); \
        fi
 
 test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
-       @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
-         echo "skipping testtsa test -- requires RSA"; \
+       @if OPENSSL_CONF=/dev/null ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
+           echo SKIP $@ -- requires RSA; \
        else \
+         echo $(START) $@; \
          sh ./testtsa; \
        fi
 
 test_ige: $(IGETEST)$(EXE_EXT)
-       @echo "Test IGE mode"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(IGETEST)
 
 test_jpake: $(JPAKETEST)$(EXE_EXT)
-       @echo "Test JPAKE"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(JPAKETEST)
 
 test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
-       @echo "CMS consistency test"
-       $(PERL) cms-test.pl
+       @echo $(START) $@
+       OPENSSL_CONFIG=/dev/null $(PERL) cms-test.pl
 
 test_srp: $(SRPTEST)$(EXE_EXT)
-       @echo "Test SRP"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./srptest
 
 test_v3name: $(V3NAMETEST)$(EXE_EXT)
-       @echo "Test X509v3_check_*"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(V3NAMETEST)
 
 test_ocsp: ../apps/openssl$(EXE_EXT) tocsp
-       @echo "Test OCSP"
+       @echo $(START) $@
        @sh ./tocsp
 
 test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
 
 test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
-       @echo "Test constant time utilites"
+       @echo $(START) $@
        ../util/shlib_wrap.sh ./$(CONSTTIMETEST)
 
-lint:
-       lint -DLINT $(INCLUDES) $(SRC)>fluff
-
 depend:
        @if [ -z "$(THIS)" ]; then \
            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
@@ -373,8 +402,7 @@ 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
+       rm -f newkey.pem testkey.pem testreq.pem
 
 clean:
        rm -f .rnd tmp.bntest tmp.bctest *.o *.obj *.dll lib tags core .pure .nfs* *.old *.bak fluff $(EXE) *.ss *.srl log dummytest
@@ -388,14 +416,14 @@ $(DLIBCRYPTO):
 BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
                shlib_target="$(SHLIB_TARGET)"; \
        fi; \
-       LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
+       LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o $$testutil" \
                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
                link_app.$${shlib_target}
 
 BUILD_CMD_STATIC=shlib_target=; \
-       LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO) $(LIBKRB5)"; \
+       LIBRARIES="$(DLIBSSL) $(DLIBCRYPTO)"; \
        $(MAKE) -f $(TOP)/Makefile.shared -e \
                APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o $$testutil" \
                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
@@ -447,7 +475,7 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
 FIPS_CRYPTO_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
                shlib_target="$(SHLIB_TARGET)"; \
        fi; \
-       LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
+       LIBRARIES="$(LIBSSL) $(LIBCRYPTO)"; \
        if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
                FIPSLD_CC="$(CC)"; CC=$(TOP)/fips/fipsld; export CC FIPSLD_CC; \
        fi; \
@@ -580,7 +608,7 @@ bntest.o: ../include/openssl/symhacks.h ../include/openssl/x509.h
 bntest.o: ../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: ../e_os.h ../include/internal/constant_time_locl.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/e_os2.h
@@ -683,15 +711,15 @@ 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
-gost2814789test.o: ../engines/ccgost/gost89.h ../include/openssl/asn1.h
-gost2814789test.o: ../include/openssl/bio.h ../include/openssl/buffer.h
-gost2814789test.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-gost2814789test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
-gost2814789test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
-gost2814789test.o: ../include/openssl/engine.h ../include/openssl/err.h
-gost2814789test.o: ../include/openssl/evp.h ../include/openssl/hmac.h
-gost2814789test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
-gost2814789test.o: ../include/openssl/objects.h
+gost2814789test.o: ../e_os.h ../engines/ccgost/gost89.h
+gost2814789test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+gost2814789test.o: ../include/openssl/buffer.h ../include/openssl/conf.h
+gost2814789test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+gost2814789test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+gost2814789test.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
+gost2814789test.o: ../include/openssl/err.h ../include/openssl/evp.h
+gost2814789test.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
+gost2814789test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 gost2814789test.o: ../include/openssl/opensslconf.h
 gost2814789test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 gost2814789test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
@@ -705,9 +733,8 @@ heartbeat_test.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
 heartbeat_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
 heartbeat_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
 heartbeat_test.o: ../include/openssl/evp.h ../include/openssl/hmac.h
-heartbeat_test.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
-heartbeat_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-heartbeat_test.o: ../include/openssl/opensslconf.h
+heartbeat_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+heartbeat_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 heartbeat_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 heartbeat_test.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 heartbeat_test.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
@@ -717,8 +744,8 @@ heartbeat_test.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 heartbeat_test.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 heartbeat_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 heartbeat_test.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-heartbeat_test.o: ../include/openssl/x509_vfy.h ../ssl/ssl_locl.h
-heartbeat_test.o: heartbeat_test.c testutil.h
+heartbeat_test.o: ../include/openssl/x509_vfy.h ../ssl/record/record.h
+heartbeat_test.o: ../ssl/ssl_locl.h heartbeat_test.c testutil.h
 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/hmac.h
@@ -729,21 +756,14 @@ 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/crypto.h
+igetest.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/crypto.h
 igetest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
 igetest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 igetest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
 igetest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h igetest.c
-jpaketest.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
-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: ../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
+jpaketest.o: ../include/openssl/opensslconf.h jpaketest.c
+md2test.o: ../e_os.h ../include/openssl/e_os2.h
+md2test.o: ../include/openssl/opensslconf.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/md4.h
@@ -787,11 +807,8 @@ rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h rc2test.c
 rc4test.o: ../e_os.h ../include/openssl/e_os2.h
 rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h
 rc4test.o: ../include/openssl/sha.h rc4test.c
-rc5test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
-rc5test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
-rc5test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-rc5test.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-rc5test.o: ../include/openssl/symhacks.h rc5test.c
+rc5test.o: ../e_os.h ../include/openssl/e_os2.h
+rc5test.o: ../include/openssl/opensslconf.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/obj_mac.h
@@ -823,21 +840,22 @@ 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/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/srp.h
-ssltest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
-ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-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 ../ssl/ssl_locl.h ssltest.c
-testutil.o: testutil.c testutil.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/pqueue.h
+ssltest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+ssltest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssltest.o: ../include/openssl/srp.h ../include/openssl/srtp.h
+ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssltest.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssltest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssltest.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+ssltest.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
+ssltest.o: ../ssl/record/record.h ../ssl/ssl_locl.h ssltest.c
+testutil.o: ../e_os.h ../include/openssl/e_os2.h
+testutil.o: ../include/openssl/opensslconf.h testutil.c testutil.h
 v3nametest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 v3nametest.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 v3nametest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h