X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=test%2Frecipes%2F25-test_req.t;h=17a98dc9d151312472ab7b1570853b6f2165b641;hb=cc4e37f1e4af060dc41a3c84041a183ecd7aa80e;hp=4f9de779ed21fc940712c7404a6985c777c5fac1;hpb=fd99c6b599a8ed87b726caaa6d88c6915a60e0f4;p=openssl.git

diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index 4f9de779ed..17a98dc9d1 100644
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -1,23 +1,71 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2015-2018 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;
 
-use File::Spec;
-use OpenSSL::Test qw/:DEFAULT top_file/;
+use OpenSSL::Test::Utils;
+use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_req");
 
-plan tests => 3;
+plan tests => 9;
+
+require_ok(srctop_file('test','recipes','tconversion.pl'));
+
+open RND, ">>", ".rnd";
+print RND "string to make the random number generator think it has randomness";
+close RND;
+
+# What type of key to generate?
+my @req_new;
+if (disabled("rsa")) {
+    @req_new = ("-newkey", "dsa:".srctop_file("apps", "dsa512.pem"));
+} else {
+    @req_new = ("-new");
+    note("There should be a 2 sequences of .'s and some +'s.");
+    note("There should not be more that at most 80 per line");
+}
 
-require_ok(top_file('test','recipes','tconversion.pl'));
+# Check for duplicate -addext parameters, and one "working" case.
+my @addext_args = ( "openssl", "req", "-new", "-out", "testreq.pem",
+    "-config", srctop_file("test", "test.cnf"), @req_new );
+my $val = "subjectAltName=DNS:example.com";
+my $val2 = " " . $val;
+my $val3 = $val;
+$val3 =~ s/=/    =/;
+ok( run(app([@addext_args, "-addext", $val])));
+ok(!run(app([@addext_args, "-addext", $val, "-addext", $val])));
+ok(!run(app([@addext_args, "-addext", $val, "-addext", $val2])));
+ok(!run(app([@addext_args, "-addext", $val, "-addext", $val3])));
+ok(!run(app([@addext_args, "-addext", $val2, "-addext", $val3])));
 
-my @openssl_args = ("req", "-config", "../apps/openssl.cnf");
+subtest "generating certificate requests" => sub {
+    plan tests => 2;
+
+    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
+		@req_new, "-out", "testreq.pem"])),
+       "Generating request");
+
+    ok(run(app(["openssl", "req", "-config", srctop_file("test", "test.cnf"),
+		"-verify", "-in", "testreq.pem", "-noout"])),
+       "Verifying signature on request");
+};
+
+my @openssl_args = ("req", "-config", srctop_file("apps", "openssl.cnf"));
 
 run_conversion('req conversions',
 	       "testreq.pem");
 run_conversion('req conversions -- testreq2',
-	       "testreq2.pem");
+	       srctop_file("test", "testreq2.pem"));
+
+unlink "testkey.pem", "testreq.pem";
 
 sub run_conversion {
     my $title = shift;
@@ -31,9 +79,9 @@ sub run_conversion {
 	open DATA, "req-check.err";
       SKIP: {
 	  plan skip_all => "skipping req conversion test for $reqfile"
-	      if grep /Unknown Public Key/, map { chomp } <DATA>;
+	      if grep /Unknown Public Key/, map { s/\R//; } <DATA>;
 
-	  tconversion("req", "testreq.pem", @openssl_args);
+	  tconversion("req", $reqfile, @openssl_args);
 	}
 	close DATA;
 	unlink "req-check.err";