X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Frecipes%2F80-test_ca.t;h=557777e191aa2c70e7b57bf658fe12e563493504;hb=649cfb5cbb78e3c4c91ceb65fad2a4daad6047dd;hp=983f8ce1b2f3f962262b5774ab20507a03f38367;hpb=7d9b2d53a2ebef2414f7b79b1ba8a81f50bd9be9;p=oweals%2Fopenssl.git

diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index 983f8ce1b2..557777e191 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -1,4 +1,11 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 
 use strict;
 use warnings;
@@ -6,39 +13,47 @@ 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");
 
-$ENV{OPENSSL} = cmdstr(app(["openssl"]));
+$ENV{OPENSSL} = cmdstr(app(["openssl"]), display => 1);
 my $std_openssl_cnf =
     srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf");
 
 rmtree("demoCA", { safe => 0 });
 
-plan tests => 4;
+plan tests => 5;
  SKIP: {
-     $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "CAss.cnf");
-     skip "failed creating CA structure", 3
+     $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "CAss.cnf").'"';
+     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
+     $ENV{OPENSSL_CONFIG} = '-config "'.srctop_file("test", "Uss.cnf").'"';
+     skip "failed creating new certificate request", 3
 	 if !ok(run(perlapp(["CA.pl","-newreq"])),
-		'creating CA structure');
+		'creating certificate request');
 
-     $ENV{OPENSSL_CONFIG} = "-config ".$std_openssl_cnf;
-     skip "failed to sign certificate request", 1
+     $ENV{OPENSSL_CONFIG} = '-rand_serial -config "'.$std_openssl_cnf.'"';
+     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');
+        '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');
 }
 
 
 rmtree("demoCA", { safe => 0 });
-unlink "newcert.pem", "newreq.pem";
+unlink "newcert.pem", "newreq.pem", "newkey.pem";
 
 
 sub yes {