--- a/jdk/test/ProblemList.txt	Tue Sep 13 15:28:44 2016 +0300
+++ b/jdk/test/ProblemList.txt	Wed Sep 14 11:06:26 2016 +0800
@@ -217,66 +217,6 @@
 
 sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java      8026393 generic-all
 
-sun/security/pkcs11/Cipher/ReinitCipher.java                    8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java           8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestRSACipher.java                   8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestRSACipherWrap.java               8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestRawRSACipher.java                8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestSymmCiphers.java                 8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java            8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/TestDH.java                    8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/TestInterop.java               8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/TestShort.java                 8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java           8077138 windows-all
-sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java         8077138 windows-all
-sun/security/pkcs11/KeyGenerator/DESParity.java                 8077138,8023434 windows-all
-sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java          8077138,8023434 windows-all
-sun/security/pkcs11/KeyPairGenerator/TestDH2048.java            8077138,8023434 windows-all
-sun/security/pkcs11/KeyStore/SecretKeysBasic.sh                 8077138,8023434 windows-all
-sun/security/pkcs11/Mac/MacKAT.java                             8077138,8023434 windows-all
-sun/security/pkcs11/Mac/MacSameTest.java                        8077138,8023434 windows-all
-sun/security/pkcs11/Mac/ReinitMac.java                          8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/ByteBuffers.java              8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/DigestKAT.java                8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/ReinitDigest.java             8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/TestCloning.java              8077138,8023434 windows-all
-sun/security/pkcs11/Provider/ConfigQuotedString.sh              8077138,8023434 windows-all
-sun/security/pkcs11/Provider/Login.sh                           8077138,8023434 windows-all
-sun/security/pkcs11/SampleTest.java                             8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/AddPrivateKey.java                   8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/AddTrustedCert.java                  8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/Crypto.java                          8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/GetPrivateKey.java                   8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/JksSetPrivateKey.java                8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/LoadKeystore.java                    8077138,8023434 windows-all
-sun/security/pkcs11/SecureRandom/Basic.java                     8077138,8023434 windows-all
-sun/security/pkcs11/SecureRandom/TestDeserialization.java       8077138,8023434 windows-all
-sun/security/pkcs11/Serialize/SerializeProvider.java            8077138,8023434 windows-all
-sun/security/pkcs11/Signature/ByteBuffers.java                  8077138,8023434 windows-all
-sun/security/pkcs11/Signature/ReinitSignature.java              8077138,8023434 windows-all
-sun/security/pkcs11/Signature/TestDSA.java                      8077138,8023434 windows-all
-sun/security/pkcs11/Signature/TestDSAKeyLength.java             8077138,8023434 windows-all
-sun/security/pkcs11/Signature/TestRSAKeyLength.java             8077138,8023434 windows-all
-sun/security/pkcs11/ec/ReadCertificates.java                    8077138,8023434 windows-all
-sun/security/pkcs11/ec/ReadPKCS12.java                          8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestCurves.java                          8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDH.java                            8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDH2.java                           8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDSA.java                           8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDSA2.java                          8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECGenSpec.java                       8077138,8023434 windows-all
-sun/security/pkcs11/rsa/KeyWrap.java                            8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestCACerts.java                        8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestKeyFactory.java                     8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestKeyPairGenerator.java               8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestSignatures.java                     8077138,8023434 windows-all
-sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestKeyMaterial.java                    8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestLeadingZeroesP11.java               8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestMasterSecret.java                   8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestPRF.java                            8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestPremaster.java                      8077138,8023434 windows-all
-
 sun/security/krb5/auto/HttpNegotiateServer.java                 8038079 generic-all
 
 sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java         8161232 macosx-all

--- a/jdk/test/sun/security/pkcs11/PKCS11Test.java	Tue Sep 13 15:28:44 2016 +0300
+++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java	Wed Sep 14 11:06:26 2016 +0800
@@ -82,8 +82,6 @@
         System.setProperty("closed.base", CLOSED_BASE);
     }
 
-    static String NSPR_PREFIX = "";
-
     // NSS version info
     public static enum ECCState { None, Basic, Extended };
     static double nss_version = -1;
@@ -294,7 +292,6 @@
         String osName = props.getProperty("os.name");
         if (osName.startsWith("Win")) {
             osName = "Windows";
-            NSPR_PREFIX = "lib";
         } else if (osName.equals("Mac OS X")) {
             osName = "MacOSX";
         }
@@ -342,9 +339,9 @@
 
     static boolean loadNSPR(String libdir) throws Exception {
         // load NSS softoken dependencies in advance to avoid resolver issues
-        safeReload(libdir + System.mapLibraryName(NSPR_PREFIX + "nspr4"));
-        safeReload(libdir + System.mapLibraryName(NSPR_PREFIX + "plc4"));
-        safeReload(libdir + System.mapLibraryName(NSPR_PREFIX + "plds4"));
+        safeReload(libdir + System.mapLibraryName("nspr4"));
+        safeReload(libdir + System.mapLibraryName("plc4"));
+        safeReload(libdir + System.mapLibraryName("plds4"));
         safeReload(libdir + System.mapLibraryName("sqlite3"));
         safeReload(libdir + System.mapLibraryName("nssutil3"));
         return true;

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nspr4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plc4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plc4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plds4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/plds4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nspr4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nspr4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plc4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plc4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plds4.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/plds4.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll has changed

Binary file jdk/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib has changed

Binary file jdk/test/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/pkcs11/nss/src/nss-3.16-with-nspr-4.10.4.tar.gz.sha256	Wed Sep 14 11:06:26 2016 +0800
@@ -0,0 +1,1 @@
+9d23633683ab3cea14519a22a997bc7f5d8d9664b6342df492c194966184ce0d  nss-3.16-with-nspr-4.10.4.tar.gz

Binary file jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz has changed

--- a/jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256	Tue Sep 13 15:28:44 2016 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-d2374795528f9cf36de07bf7c77d8c8414bb5b4da12ee7c78a57ec90d68e3706  nss-3.16_nspr-4.10_src.tar.gz