Backport 6e1aacdfba5a32f7b071eea8039888d275827e83

kurashige23 · Oct 17, 2024 · b57180e · b57180e
1 parent 42c6c17
commit b57180e
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 3 deletions.
diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert9.db b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert9.db
diff --git a/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key4.db b/jdk/test/sun/security/pkcs11/KeyStore/ClientAuthData/key4.db
diff --git a/jdk/test/sun/security/pkcs11/Secmod/cert9.db b/jdk/test/sun/security/pkcs11/Secmod/cert9.db
diff --git a/jdk/test/sun/security/pkcs11/Secmod/key4.db b/jdk/test/sun/security/pkcs11/Secmod/key4.db
diff --git a/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt b/jdk/test/sun/security/pkcs11/Secmod/pkcs11.txt
@@ -1,4 +1,8 @@
 library=
 name=NSS Internal PKCS #11 Module
-parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
-NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=trustOrder=75 cipherOrder=100 slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM askpw=any timeout=30 ] }  Flags=internal,critical
+
+library=libnssckbi.so
+name=Builtin Roots Module
+NSS=trustOrder=100 
diff --git a/jdk/test/sun/security/pkcs11/SecmodTest.java b/jdk/test/sun/security/pkcs11/SecmodTest.java
@@ -34,7 +34,7 @@ public class SecmodTest extends PKCS11Test {
     static String DBDIR;
     static char[] password = "test12".toCharArray();
     static String keyAlias = "mykey";
-    static boolean useSqlite = false;
+    static boolean useSqlite = true;
 
     static void useSqlite(boolean b) {
         useSqlite = b;

diff --git a/jdk/test/sun/security/pkcs11/fips/cert9.db b/jdk/test/sun/security/pkcs11/fips/cert9.db
diff --git a/jdk/test/sun/security/pkcs11/fips/key4.db b/jdk/test/sun/security/pkcs11/fips/key4.db
diff --git a/jdk/test/sun/security/pkcs11/fips/pkcs11.txt b/jdk/test/sun/security/pkcs11/fips/pkcs11.txt
@@ -0,0 +1,8 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=trustOrder=75 cipherOrder=100 slotParams={0x00000001=[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM askpw=any timeout=30 ] }  Flags=internal,critical
+
+library=libnssckbi.so
+name=Builtin Roots Module
+NSS=trustOrder=100