[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  51f5930ae6d17c838674f3129d992a0366a63139 (commit)
       via  a4c5f8593c1451aa40c814365d3a8ce54de92bd2 (commit)
      from  b6611753a6d9bef6a8c16850a9eb9215d8a84fac (commit)


- Log -----------------------------------------------------------------
commit 51f5930ae6d17c838674f3129d992a0366a63139
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 2 18:27:17 2017 +0100

    -precert doesn't work when configured no-ct, don't try to test it then
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2827)

commit a4c5f8593c1451aa40c814365d3a8ce54de92bd2
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 2 18:26:26 2017 +0100

    Fix the skip numbers in 80-test_ca.t
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2827)

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

Summary of changes:
 test/recipes/80-test_ca.t | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index e9ff318..f62d9d5 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -13,6 +13,7 @@ use warnings;
 use POSIX;
 use File::Path 2.00 qw/rmtree/;
 use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_ca");
 
@@ -25,23 +26,26 @@ rmtree("demoCA", { safe => 0 });
 plan tests => 5;
  SKIP: {
      $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "CAss.cnf").'"';
-     skip "failed creating CA structure", 3
+     skip "failed creating CA structure", 4
 	 if !ok(run(perlapp(["CA.pl","-newca"], stdin => undef)),
 		'creating CA structure');
 
      $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "Uss.cnf").'"';
-     skip "failed creating new certificate request", 2
+     skip "failed creating new certificate request", 3
 	 if !ok(run(perlapp(["CA.pl","-newreq"])),
 		'creating certificate request');
 
      $ENV{OPENSSL_CONFIG} = '-config "'.$std_openssl_cnf.'"';
-     skip "failed to sign certificate request", 1
+     skip "failed to sign certificate request", 2
 	 if !is(yes(cmdstr(perlapp(["CA.pl", "-sign"]))), 0,
 		'signing certificate request');
 
      ok(run(perlapp(["CA.pl", "-verify", "newcert.pem"])),
         'verifying new certificate');
 
+     skip "CT not configured, can't use -precert", 1
+         if disabled("ct");
+
      $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "Uss.cnf");
      ok(run(perlapp(["CA.pl", "-precert"], stderr => undef)),
         'creating new pre-certificate');