@@ -68,6 +68,7 @@ SRPTEST= srptest
6868V3NAMETEST = v3nametest
6969HEARTBEATTEST = heartbeat_test
7070CONSTTIMETEST = constant_time_test
71+ VERIFYEXTRATEST = verify_extra_test
7172
7273TESTS = alltests
7374
@@ -84,7 +85,7 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
8485 $(JPAKETEST )$(EXE_EXT ) $(SECMEMTEST )$(EXE_EXT ) \
8586 $(SRPTEST )$(EXE_EXT ) $(V3NAMETEST )$(EXE_EXT ) \
8687 $(HEARTBEATTEST )$(EXE_EXT ) $(P5_CRPT2_TEST )$(EXE_EXT ) \
87- $(CONSTTIMETEST )$(EXE_EXT )
88+ $(CONSTTIMETEST )$(EXE_EXT ) $( VERIFYEXTRATEST )$( EXE_EXT )
8889
8990# $(METHTEST)$(EXE_EXT)
9091
@@ -98,7 +99,7 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
9899 $(BFTEST ) .o $(SSLTEST ) .o $(DSATEST ) .o $(EXPTEST ) .o $(RSATEST ) .o \
99100 $(EVPTEST ) .o $(EVPEXTRATEST ) .o $(IGETEST ) .o $(JPAKETEST ) .o $(V3NAMETEST ) .o \
100101 $(GOST2814789TEST ) .o $(HEARTBEATTEST ) .o $(P5_CRPT2_TEST ) .o \
101- $(CONSTTIMETEST ) .o testutil.o
102+ $(CONSTTIMETEST ) .o $( VERIFYEXTRATEST ) .o testutil.o
102103
103104SRC = $(BNTEST ) .c $(ECTEST ) .c $(ECDSATEST ) .c $(ECDHTEST ) .c $(IDEATEST ) .c \
104105 $(MD2TEST ) .c $(MD4TEST ) .c $(MD5TEST ) .c \
@@ -109,7 +110,7 @@ SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
109110 $(BFTEST ) .c $(SSLTEST ) .c $(DSATEST ) .c $(EXPTEST ) .c $(RSATEST ) .c \
110111 $(EVPTEST ) .c $(EVPEXTRATEST ) .c $(IGETEST ) .c $(JPAKETEST ) .c $(V3NAMETEST ) .c \
111112 $(GOST2814789TEST ) .c $(HEARTBEATTEST ) .c $(P5_CRPT2_TEST ) .c \
112- $(CONSTTIMETEST ) .c testutil.c
113+ $(CONSTTIMETEST ) .c $( VERIFYEXTRATEST ) .c testutil.c
113114
114115HEADER = testutil.h
115116
@@ -150,7 +151,7 @@ alltests: \
150151 test_ige test_jpake test_secmem \
151152 test_srp test_cms test_v3name test_ocsp \
152153 test_gost2814789 test_heartbeat test_p5_crpt2 \
153- test_constant_time
154+ test_constant_time test_verify_extra
154155
155156test_evp : $(EVPTEST )$(EXE_EXT ) evptests.txt
156157 @echo $(START ) $@
@@ -399,6 +400,10 @@ test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
399400 @echo $(START ) $@
400401 ../util/shlib_wrap.sh ./$(CONSTTIMETEST )
401402
403+ test_verify_extra : $(VERIFYEXTRATEST )$(EXE_EXT )
404+ @echo $(START ) $@
405+ ../util/shlib_wrap.sh ./$(VERIFYEXTRATEST )
406+
402407update : local_depend
403408 @if [ -z " $( THIS) " ]; then $(MAKE ) -f $(TOP ) /Makefile reflect THIS=$@ ; fi
404409
@@ -586,6 +591,9 @@ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) testutil.o
586591$(CONSTTIMETEST )$(EXE_EXT ) : $(CONSTTIMETEST ) .o
587592 @target=$(CONSTTIMETEST ) $(BUILD_CMD )
588593
594+ $(VERIFYEXTRATEST )$(EXE_EXT ) : $(VERIFYEXTRATEST ) .o
595+ @target=$(VERIFYEXTRATEST ) $(BUILD_CMD )
596+
589597# $(AESTEST).o: $(AESTEST).c
590598# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
591599
@@ -881,6 +889,12 @@ v3nametest.o: ../include/openssl/sha.h ../include/openssl/stack.h
881889v3nametest.o : ../include/openssl/symhacks.h ../include/openssl/x509.h
882890v3nametest.o : ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
883891v3nametest.o : v3nametest.c
892+ verify_extra_test.o : ../include/openssl/crypto.h ../include/openssl/e_os2.h
893+ verify_extra_test.o : ../include/openssl/opensslconf.h
894+ verify_extra_test.o : ../include/openssl/opensslv.h
895+ verify_extra_test.o : ../include/openssl/ossl_typ.h
896+ verify_extra_test.o : ../include/openssl/safestack.h ../include/openssl/stack.h
897+ verify_extra_test.o : ../include/openssl/symhacks.h verify_extra_test.c
884898wp_test.o : ../include/openssl/crypto.h ../include/openssl/e_os2.h
885899wp_test.o : ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
886900wp_test.o : ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
0 commit comments