# HG changeset patch
# User vinnie
# Date 1403100329 -3600
# Node ID c95ced1327af828cb9c73e07b495ec9c2f31a718
# Parent  f5a6e2ed8c7de2fd5368be54e803bea4909134d0
8047085: PKCS11/NSS tests failing intermittently on Windows
Reviewed-by: mullan

diff -r f5a6e2ed8c7d -r c95ced1327af jdk/THIRD_PARTY_README
--- a/jdk/THIRD_PARTY_README	Wed Jun 18 17:34:05 2014 +0400
+++ b/jdk/THIRD_PARTY_README	Wed Jun 18 15:05:29 2014 +0100
@@ -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 -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib
Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/src/MD5SUMS
--- a/jdk/test/sun/security/pkcs11/nss/src/MD5SUMS	Wed Jun 18 17:34:05 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-1390c8a35c667e05e542  nss-3.13.1.tar.gz
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS
--- a/jdk/test/sun/security/pkcs11/nss/src/SHA1SUMS	Wed Jun 18 17:34:05 2014 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6  nss-3.13.1.tar.gz
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz
Binary file jdk/test/sun/security/pkcs11/nss/src/nss-3.13.1.tar.gz has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz
Binary file jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz has changed
diff -r f5a6e2ed8c7d -r c95ced1327af jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256	Wed Jun 18 15:05:29 2014 +0100
@@ -0,0 +1,1 @@
+d2374795528f9cf36de07bf7c77d8c8414bb5b4da12ee7c78a57ec90d68e3706  nss-3.16_nspr-4.10_src.tar.gz