[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  578a00048d78121f1ff30da49007b7b847aca21a (commit)
       via  842a20638ad423b43bfa1a5fca25547089e3d278 (commit)
      from  a6eef4c81b62bbab8d350fc8630ce8fadf0cd07a (commit)


- Log -----------------------------------------------------------------
commit 578a00048d78121f1ff30da49007b7b847aca21a
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Apr 9 11:15:16 2016 +0200

    Don't check the generated ssl-tests configs on VMS
    
    The simple reason is that the pre-generated files are mainly for Unix.
    The VMS variants look slightly different, so comparing will always fail.
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

commit 842a20638ad423b43bfa1a5fca25547089e3d278
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Apr 9 11:13:00 2016 +0200

    VMS doesn't have directory separators in the same sense as Unix
    
    Don't add / in file specs on VMS.  The directory "separator" is part
    of the directory spec.
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl_new.t  | 3 ++-
 test/ssl-tests/ssltests_base.pm | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index fc1e29c..abb6528 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -25,7 +25,8 @@ my %conf_dependent_tests = ("02-protocol-version.conf" => 1);
 
 foreach my $conf (@conf_files) {
     subtest "Test configuration $conf" => sub {
-        test_conf($conf, $conf_dependent_tests{$conf} ?  0 : 1);
+        test_conf($conf,
+                  $conf_dependent_tests{$conf} || $^O eq "VMS" ?  0 : 1);
     }
 }
 
diff --git a/test/ssl-tests/ssltests_base.pm b/test/ssl-tests/ssltests_base.pm
index 05aab97..387043e 100644
--- a/test/ssl-tests/ssltests_base.pm
+++ b/test/ssl-tests/ssltests_base.pm
@@ -4,14 +4,16 @@
 
 package ssltests;
 
+my $dir_sep = $^O ne "VMS" ? "/" : "";
+
 our %base_server = (
-    "Certificate" => "\${ENV::TEST_CERTS_DIR}/servercert.pem",
-    "PrivateKey"  => "\${ENV::TEST_CERTS_DIR}/serverkey.pem",
+    "Certificate" => "\${ENV::TEST_CERTS_DIR}${dir_sep}servercert.pem",
+    "PrivateKey"  => "\${ENV::TEST_CERTS_DIR}${dir_sep}serverkey.pem",
     "CipherString" => "DEFAULT",
 );
 
 our %base_client = (
-    "VerifyCAFile" => "\${ENV::TEST_CERTS_DIR}/rootcert.pem",
+    "VerifyCAFile" => "\${ENV::TEST_CERTS_DIR}${dir_sep}rootcert.pem",
     "VerifyMode" => "Peer",
     "CipherString" => "DEFAULT",
 );