Update client authentication tests

[openssl.git] / test / recipes / 20-test_enc.t

diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t
index 813e20120e4a6fa7dc7cc8e99ede8dd45658274c..88a589041a01c62a6d9cdab6d200be037a6e70bc 100644 (file)
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.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;
@@ -7,22 +14,21 @@ use File::Spec::Functions qw/catfile/;
 use File::Copy;
 use File::Compare qw/compare_text/;
 use File::Basename;
-use Test::More;
-use OpenSSL::Test qw/:DEFAULT top_file/;
+use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_enc");
 
 # We do it this way, because setup() may have moved us around,
 # so the directory portion of $0 might not be correct any more.
 # However, the name hasn't changed.
-my $testsrc = top_file("test","recipes",basename($0));
+my $testsrc = srctop_file("test","recipes",basename($0));
 
 my $test = catfile(".", "p");
 
 my $cmd = "openssl";
 
 my @ciphers =
-    map { chomp; s/^\s+//; s/\s+$//; split /\s+/ }
+    map { s/^\s+//; s/\s+$//; split /\s+/ }
     run(app([$cmd, "list", "-cipher-commands"]), capture => 1);
 
 plan tests => 1 + (scalar @ciphers)*2;
@@ -52,10 +58,8 @@ if (!$init) {
                 @d = ( "enc", @{$variant{$t}}, "-d" );
             }
 
-            ok(run(app([$cmd, @e],
-                       stdin => $test, stdout => $cipherfile))
-               && run(app([$cmd, @d],
-                          stdin => $cipherfile, stdout => $clearfile))
+            ok(run(app([$cmd, @e, "-in", $test, "-out", $cipherfile]))
+               && run(app([$cmd, @d, "-in", $cipherfile, "-out", $clearfile]))
                && compare_text($test,$clearfile) == 0, $t);
             unlink $cipherfile, $clearfile;
         }