X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Frecipes%2F15-test_rsa.t;h=3b1a0fcd5d17bc536188ea9d6a18e662b5349f7d;hp=9b17fbef9dac30ddaa0fabc286f5805c98b9d36f;hb=31b28ad96aa841ae39d4009ebb15d90f2a2afdab;hpb=0c85cc506916039bba86e8335aa71e0e44f038b0

diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index 9b17fbef9d..3b1a0fcd5d 100644
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -1,32 +1,47 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (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 qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_rsa");
 
-plan tests => 5;
+plan tests => 6;
 
-require_ok(top_file('test','recipes','tconversion.pl'));
+require_ok(srctop_file('test','recipes','tconversion.pl'));
 
 ok(run(test(["rsa_test"])), "running rsatest");
 
+ok(run(app([ 'openssl', 'rsa', '-check', '-in', srctop_file('test', 'testrsa.pem'), '-noout'])), "rsa -check");
+
  SKIP: {
      skip "Skipping rsa conversion test", 3
-	 if run(app(["openssl","no-rsa"], stdout => undef));
+	 if disabled("rsa");
 
      subtest 'rsa conversions -- private key' => sub {
-	 tconversion("rsa", top_file("test","testrsa.pem"));
+	 tconversion("rsa", srctop_file("test","testrsa.pem"));
      };
      subtest 'rsa conversions -- private key PKCS#8' => sub {
-	 tconversion("rsa", top_file("test","testrsa.pem"), "pkey");
+	 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("rsa", top_file("test","testrsapub.pem"), "rsa",
+	 tconversion("msb", srctop_file("test","testrsapub.pem"), "rsa",
 		     "-pubin", "-pubout");
      };
 }