[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7a05eaac5e15e327b7c51258bf892c8ae5b1d956 (commit)
      from  c40dba984a626fb622bb4264bd8e297236bbfd2b (commit)


- Log -----------------------------------------------------------------
commit 7a05eaac5e15e327b7c51258bf892c8ae5b1d956
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 14 15:55:59 2015 +0200

    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: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/Makefile   | 6 +++---
 util/pl/unix.pl | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 01724aa..6c973ad 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -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
diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 652e7ee..40bbe0d 100644
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -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',