[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d8594555ffaf98ada08b26ce3d1138f16bc029c5 (commit)
      from  aec23ecebdb8101d2b3b8420b54353b2aebc33fc (commit)


- Log -----------------------------------------------------------------
commit d8594555ffaf98ada08b26ce3d1138f16bc029c5
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 4 09:34:42 2017 +0100

    Don't run MSBLOB conversion tests when RSA or DSA are disabled
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2174)

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

Summary of changes:
 test/recipes/15-test_rsa.t | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index a57ce63..5988821 100644
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -34,6 +34,12 @@ ok(run(app([ 'openssl', 'rsa', '-check', '-in', srctop_file('test', 'testrsa.pem
      subtest 'rsa conversions -- private key PKCS#8' => sub {
 	 tconversion("rsa", srctop_file("test","testrsa.pem"), "pkey");
      };
+}
+
+ SKIP: {
+     skip "Skipping msblob conversion test", 1
+	 if disabled("rsa") || disabled("dsa");
+
      subtest 'rsa conversions -- public key' => sub {
 	 tconversion("msb", srctop_file("test","testrsapub.pem"), "rsa",
 		     "-pubin", "-pubout");