From: Andy Polyakov <appro@openssl.org>
Date: Mon, 25 Jul 2016 23:46:03 +0000 (+0200)
Subject: Add PKCS#12 UTF-8 interoperability test.
X-Git-Tag: OpenSSL_1_1_0~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70bf33d1821baf44764555be6a63488798c4d086;p=oweals%2Fopenssl.git

Add PKCS#12 UTF-8 interoperability test.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
new file mode 100644
index 0000000000..681ce45fcb
--- /dev/null
+++ b/test/recipes/80-test_pkcs12.t
@@ -0,0 +1,31 @@
+use strict;
+use warnings;
+
+use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use Encode;
+
+setup("test_pkcs12");
+
+plan tests => 1;
+
+my $pass = "σύνθημα γνώρισμα";
+
+my $savedcp;
+if (eval { require Win32::Console; 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...
+
+    $savedcp = Win32::Console::OutputCP();
+    Win32::Console::OutputCP(1253);
+    $pass = Encode::encode("cp1253",Encode::decode("utf-8",$pass));
+}
+
+# just see that we can read shibboleth.pfx protected with $pass
+ok(run(app(["openssl", "pkcs12", "-noout",
+            "-password", "pass:$pass",
+            "-in", srctop_file("test", "shibboleth.pfx")])),
+   "test_pkcs12");
+
+Win32::Console::OutputCP($savedcp) if (defined($savedcp));
diff --git a/test/shibboleth.pfx b/test/shibboleth.pfx
new file mode 100644
index 0000000000..9c5cc546b8
Binary files /dev/null and b/test/shibboleth.pfx differ