Update code for the final RFC version of TLSv1.3 (RFC8446)

[openssl.git] / test / recipes / 80-test_pkcs12.t

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index 4a65268c029d68e2afa112531f5f7f96d80ff3e4..430df6708217a3f4c7c31a93b85a71108032a110 100644 (file)
--- a/test/recipes/80-test_pkcs12.t
+++ b/test/recipes/80-test_pkcs12.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2018 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
@@ -19,22 +19,32 @@ setup("test_pkcs12");
 plan skip_all => "The PKCS12 command line utility is not supported by this OpenSSL build"
     if disabled("des");
 
-plan tests => 1;
-
 my $pass = "σύνθημα γνώρισμα";
 
 my $savedcp;
-if (eval { require Win32::Console; 1; }) {
+if (eval { require Win32::API; 1; }) {
     # Trouble is that Win32 perl uses CreateProcessA, which
-    # makes it problematic to pass non-ASCII arguments. The only
-    # feasible option is to pick one language, set corresponding
-    # code page and reencode the problematic string...
+    # makes it problematic to pass non-ASCII arguments, from perl[!]
+    # that is. This is because CreateProcessA is just a wrapper for
+    # CreateProcessW and will call MultiByteToWideChar and use
+    # system default locale. Since we attempt Greek pass-phrase
+    # conversion can be done only with Greek locale.
 
-    $savedcp = Win32::Console::OutputCP();
-    Win32::Console::OutputCP(1253);
-    $pass = Encode::encode("cp1253",Encode::decode("utf-8",$pass));
+    Win32::API->Import("kernel32","UINT GetSystemDefaultLCID()");
+    if (GetSystemDefaultLCID() != 0x408) {
+        plan skip_all => "Non-Greek system locale";
+    } else {
+        # Ensure correct code page so that VERBOSE output is right.
+        Win32::API->Import("kernel32","UINT GetConsoleOutputCP()");
+        Win32::API->Import("kernel32","BOOL SetConsoleOutputCP(UINT cp)");
+        $savedcp = GetConsoleOutputCP();
+        SetConsoleOutputCP(1253);
+        $pass = Encode::encode("cp1253",Encode::decode("utf-8",$pass));
+    }
+} elsif ($^O eq "MSWin32") {
+    plan skip_all => "Win32::API unavailable";
 } else {
-    # Running MinGW tests transparenly under Wine apparently requires
+    # Running MinGW tests transparently under Wine apparently requires
     # UTF-8 locale...
 
     foreach(`locale -a`) {
@@ -45,6 +55,9 @@ if (eval { require Win32::Console; 1; }) {
         }
     }
 }
+$ENV{OPENSSL_WIN32_UTF8}=1;
+
+plan tests => 1;
 
 # just see that we can read shibboleth.pfx protected with $pass
 ok(run(app(["openssl", "pkcs12", "-noout",
@@ -52,4 +65,4 @@ ok(run(app(["openssl", "pkcs12", "-noout",
             "-in", srctop_file("test", "shibboleth.pfx")])),
    "test_pkcs12");
 
-Win32::Console::OutputCP($savedcp) if (defined($savedcp));
+SetConsoleOutputCP($savedcp) if (defined($savedcp));