Commit 7a05eaac authored by Richard Levitte's avatar Richard Levitte
Browse files

Adjust unixly mk1mf after introduction of tkey 



Added depencies on the public variants of some keys in test to Makefile.
Added the newly introduced key files from test/ in the list of files
to copy in util/pl/unix.pl.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent c40dba98

test/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe 
	@echo $(START) $@ -- second x509v3 certificate

	sh ./tx509 v3-cert2.pem



test_rsa: $(RSATEST)$(EXE_EXT) ../apps/openssl$(EXE_EXT) tkey testrsa.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
@@ -282,7 +282,7 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest 
	@echo $(START) $@ -- $(EXPTEST)

	../util/shlib_wrap.sh ./$(EXPTEST)



test_ec: $(ECTEST)$(EXE_EXT) tkey testec-p256.pem

test_ec: $(ECTEST)$(EXE_EXT) tkey testec-p256.pem testecpub-p256.pem

	@echo $(START) $@

	../util/shlib_wrap.sh ./$(ECTEST)

	@echo $(START) $@ -- private
@@ -306,7 +306,7 @@ test_dh: $(DHTEST)$(EXE_EXT) 
	@echo $(START) $@

	../util/shlib_wrap.sh ./$(DHTEST)



test_dsa: $(DSATEST)$(EXE_EXT) tkey testdsa.pem

test_dsa: $(DSATEST)$(EXE_EXT) tkey testdsa.pem testdsapub.pem

	@echo $(START) $@

	../util/shlib_wrap.sh ./$(DSATEST)

	@echo $(START) $@ -- app2_1

util/pl/unix.pl

+6 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ sub get_tests 
		 'treq',

		 'tpkcs7',

		 'tpkcs7d',

		 'tkey',

		 'testcrl.pem',

		 'testx509.pem',

		 'v3-cert1.pem',
@@ -401,7 +402,12 @@ sub get_tests 
		 'testp7.pem',

		 'pkcs7-1.pem',

		 'trsa',

		 'testdsa.pem',

		 'testdsapub.pem',

		 'testec-p256.pem',

		 'testecpub-p256.pem',

		 'testrsa.pem',

		 'testrsapub.pem',

		 'testsid.pem',

		 'testss',

		 'testssl',