6880559: Enable PKCS11 64-bit windows builds
Reviewed-by: valeriep
diff --git a/test/sun/security/pkcs11/PKCS11Test.java b/test/sun/security/pkcs11/PKCS11Test.java
index d47c30e..3fc5d86 100644
--- a/test/sun/security/pkcs11/PKCS11Test.java
+++ b/test/sun/security/pkcs11/PKCS11Test.java
@@ -245,6 +245,10 @@
osMap.put("SunOS-amd64-64", "/usr/lib/mps/64/");
osMap.put("Linux-i386-32", "/usr/lib/");
osMap.put("Linux-amd64-64", "/usr/lib64/");
+ osMap.put("Windows-x86-32",
+ PKCS11_BASE + "/nss/lib/windows-i586/".replace('/', SEP));
+ osMap.put("Windows-amd64-64",
+ PKCS11_BASE + "/nss/lib/windows-amd64/".replace('/', SEP));
}
private final static char[] hexDigits = "0123456789abcdef".toCharArray();
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk b/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
new file mode 100644
index 0000000..f661c20
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
new file mode 100644
index 0000000..0532e8f
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
new file mode 100644
index 0000000..b33221e
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib b/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
new file mode 100644
index 0000000..829407c
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
new file mode 100644
index 0000000..dbf13da
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
new file mode 100644
index 0000000..145179e
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
new file mode 100644
index 0000000..6d44edb
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
new file mode 100644
index 0000000..9c552e4
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
new file mode 100644
index 0000000..67423e7
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib b/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
new file mode 100644
index 0000000..a3bb1af
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
new file mode 100644
index 0000000..273bee6
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
new file mode 100644
index 0000000..4c91f8a
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
new file mode 100644
index 0000000..e0e93a7
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
new file mode 100644
index 0000000..55b12f1
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
new file mode 100644
index 0000000..3fee97a
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk b/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
new file mode 100644
index 0000000..5e80c45
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
new file mode 100644
index 0000000..f489b01
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
new file mode 100644
index 0000000..72e3b2f
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll b/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
new file mode 100644
index 0000000..372fa2e
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib b/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
new file mode 100644
index 0000000..811f6ab
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk b/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
new file mode 100644
index 0000000..3059a8e
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
new file mode 100644
index 0000000..8b393ac
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
new file mode 100644
index 0000000..1bbbeb9
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib b/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
new file mode 100644
index 0000000..912c5cd
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
new file mode 100644
index 0000000..ca18455
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib b/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
new file mode 100644
index 0000000..2125d3d
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
new file mode 100644
index 0000000..b529a67
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib b/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
new file mode 100644
index 0000000..33f4262
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
new file mode 100644
index 0000000..a496bd3
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib b/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
new file mode 100644
index 0000000..6025426
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
new file mode 100644
index 0000000..0d42ee2
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk b/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
new file mode 100644
index 0000000..7aaa0c0
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
new file mode 100644
index 0000000..343d803
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
new file mode 100644
index 0000000..3b73a18
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib b/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
new file mode 100644
index 0000000..397bd3e
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk b/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
new file mode 100644
index 0000000..ab0a785
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
new file mode 100644
index 0000000..735b38f
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
new file mode 100644
index 0000000..4530107
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll b/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
new file mode 100644
index 0000000..e9961ca
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib b/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
new file mode 100644
index 0000000..7383dee
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
Binary files differ
diff --git a/test/sun/security/pkcs11/nss/src/MD5SUMS b/test/sun/security/pkcs11/nss/src/MD5SUMS
new file mode 100644
index 0000000..5ca2469
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/src/MD5SUMS
@@ -0,0 +1 @@
+1390c8a35c667e05e542 nss-3.13.1.tar.gz
diff --git a/test/sun/security/pkcs11/nss/src/SHA1SUMS b/test/sun/security/pkcs11/nss/src/SHA1SUMS
new file mode 100644
index 0000000..1381f4e
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/src/SHA1SUMS
@@ -0,0 +1 @@
+d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 nss-3.13.1.tar.gz
diff --git a/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz b/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
new file mode 100644
index 0000000..14ebb66
--- /dev/null
+++ b/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
Binary files differ