[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9c626317a60f8be8b61df25854f42ad9d73ad205 (commit)
      from  4ddd5aceccee47f5d530b4741b02c839cefc9001 (commit)


- Log -----------------------------------------------------------------
commit 9c626317a60f8be8b61df25854f42ad9d73ad205
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Jan 30 16:42:18 2016 +0100

    Fix test/recipes/25-test_verify.t
    
    top_dir() are used to create directory names, top_file() should be
    used for files.  In a Unixly environment, that doesn't matter, but...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/25-test_verify.t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
index 030e4a5..56d8307 100644
--- a/test/recipes/25-test_verify.t
+++ b/test/recipes/25-test_verify.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec::Functions qw/canonpath/;
-use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
+use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_verify");
 
@@ -13,9 +13,9 @@ sub verify {
     my @args = qw(openssl verify -verify_name);
     my @path = qw(test certs);
     push(@args, "$vname", @opts);
-    for (@$trusted) { push(@args, "-trusted", top_dir(@path, "$_.pem")) }
-    for (@$untrusted) { push(@args, "-untrusted", top_dir(@path, "$_.pem")) }
-    push(@args, top_dir(@path, "$cert.pem"));
+    for (@$trusted) { push(@args, "-trusted", top_file(@path, "$_.pem")) }
+    for (@$untrusted) { push(@args, "-untrusted", top_file(@path, "$_.pem")) }
+    push(@args, top_file(@path, "$cert.pem"));
     run(app([@args]));
 }