X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Frecipes%2F25-test_req.t;h=bcc10257d46875471bacc90f3da2dd149feef2ca;hp=50c18a9c1bbab05163e46a5826f3bf7ed8ce0262;hb=e2ec7332c45a39369cb541bbc33d88188b2acd94;hpb=4650de3e431d123e988821215f6473e93c3d4b17

diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index 50c18a9c1b..bcc10257d4 100644
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -1,24 +1,56 @@
-#! /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;
 
-use File::Spec;
-use Test::More;
-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 => 4;
+
+require_ok(srctop_file('test','recipes','tconversion.pl'));
+
+open RND, ">>", ".rnd";
+print RND "string to make the random number generator think it has entropy";
+close RND;
+subtest "generating certificate requests" => sub {
+    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'));
+    plan tests => 2;
 
-my @openssl_args = ("req", "-config", "../apps/openssl.cnf");
+    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;
@@ -32,9 +64,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";