8047085: PKCS11/NSS tests failing intermittently on Windows Reviewed-by: mullan

commit: d5002ca9752da1a5031473c3a8e38cd1ed9b3c97 [log] [tgz]
author: Vinnie Ryan <vinnie@openjdk.org> Wed Jun 18 17:50:55 2014 +0100
committer: Vinnie Ryan <vinnie@openjdk.org> Wed Jun 18 17:50:55 2014 +0100
tree: 46ebecfc6ca6e40fc42a85d2dfb4e08ea8bc510d
parent: 84c441ee21d1a27dc1a400ca815135e0f635239d [diff]
diff --git a/jdk/THIRD_PARTY_README b/jdk/THIRD_PARTY_README
index ce01810..e16cd2a 100644
--- a/jdk/THIRD_PARTY_README
+++ b/jdk/THIRD_PARTY_README

@@ -1471,7 +1471,7 @@
 version 2.0.
 
 The NSS libraries are supplied in executable form, built from unmodified
-NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
+NSS source code labeled with the "NSS_3_16_RTM" HG tag.
 
 The NSS source code is available in the OpenJDK source code repository at:
     jdk/test/sun/security/pkcs11/nss/src

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
index f661c20..7ea34d0 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
index 0532e8f..6c03f7d 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
index b33221e..fc573be 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
index 829407c..64aa296 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
index dbf13da..519c80e 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
index 145179e..1df6f28 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
index 6d44edb..dc56672 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
index 9c552e4..b424eef 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
index 67423e7..67f06d4 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
index a3bb1af..c73d3ef 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
index 273bee6..28c8474 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
index 4c91f8a..e8e9b94 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
index e0e93a7..f1a722c 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
index 55b12f1..3eeca26 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
index 3fee97a..9f6ea2d 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
index 5e80c45..f002c34 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
index f489b01..6293c7d 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
index 72e3b2f..18c8fca 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
index 372fa2e..5e06d33 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
index 811f6ab..21e83de 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
index 3059a8e..7f4e147 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
index 8b393ac..eea9e97 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
index 1bbbeb9..f073dc9 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
index 912c5cd..7351a9e 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
index ca18455..0e74aec 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
index 2125d3d..cff555e 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
index b529a67..3247b92 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
index 33f42622f..876979f 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
index a496bd3..0411891 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
index 6025426..1d8272f 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
index 0d42ee2..123a8bf 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
index 7aaa0c0..bc51e40 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
index 343d803..0572b4e 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
index 3b73a18..f4dba08 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
index 397bd3e..7cd24f3 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
index ab0a785..84ea2e2 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
index 735b38f..615e7c0 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
index 4530107..9a130aa 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
index e9961ca..41f962a 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
index 7383dee..7240059 100644
--- a/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
+++ b/jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/src/MD5SUMS b/jdk/test/sun/security/pkcs11/nss/src/MD5SUMS
deleted file mode 100644
index 5ca2469..0000000
--- a/jdk/test/sun/security/pkcs11/nss/src/MD5SUMS
+++ /dev/null

@@ -1 +0,0 @@
-1390c8a35c667e05e542  nss-3.13.1.tar.gz

diff --git a/jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS b/jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS
deleted file mode 100644
index 1381f4e..0000000
--- a/jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS
+++ /dev/null

@@ -1 +0,0 @@
-d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6  nss-3.13.1.tar.gz

diff --git a/jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz b/jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
deleted file mode 100644
index 14ebb66..0000000
--- a/jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
+++ /dev/null
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz
new file mode 100644
index 0000000..0927354
--- /dev/null
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz
Binary files differ

diff --git a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256 b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256
new file mode 100644
index 0000000..6ea9a98
--- /dev/null
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256

@@ -0,0 +1 @@
+d2374795528f9cf36de07bf7c77d8c8414bb5b4da12ee7c78a57ec90d68e3706  nss-3.16_nspr-4.10_src.tar.gz
commit	d5002ca9752da1a5031473c3a8e38cd1ed9b3c97	[log] [tgz]
author	Vinnie Ryan <vinnie@openjdk.org>	Wed Jun 18 17:50:55 2014 +0100
committer	Vinnie Ryan <vinnie@openjdk.org>	Wed Jun 18 17:50:55 2014 +0100
tree	46ebecfc6ca6e40fc42a85d2dfb4e08ea8bc510d
parent	84c441ee21d1a27dc1a400ca815135e0f635239d [diff]