Skip to content

Commit 276a157

Browse files
kurashige23Paul Hohensee
authored andcommitted
8296631: NSS tests failing on OL9 linux-aarch64 hosts
Reviewed-by: phh Backport-of: 6e1aacdfba5a32f7b071eea8039888d275827e83
1 parent 524170d commit 276a157

File tree

11 files changed

+36
-9
lines changed

11 files changed

+36
-9
lines changed
Binary file not shown.
Binary file not shown.

test/jdk/sun/security/pkcs11/PKCS11Test.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -951,14 +951,22 @@ protected void copyNssCertKeyToClassesDir() throws IOException {
951951

952952
protected void copyNssCertKeyToClassesDir(Path dbPath) throws IOException {
953953
Path destinationPath = Path.of(TEST_CLASSES);
954-
String keyDbFile = "key3.db";
955-
String certDbFile = "cert8.db";
954+
String keyDbFile3 = "key3.db";
955+
String keyDbFile4 = "key4.db";
956+
String certDbFile8 = "cert8.db";
957+
String certDbFile9 = "cert9.db";
956958

957-
Files.copy(dbPath.resolve(certDbFile),
958-
destinationPath.resolve(certDbFile),
959+
Files.copy(dbPath.resolve(certDbFile8),
960+
destinationPath.resolve(certDbFile8),
959961
StandardCopyOption.REPLACE_EXISTING);
960-
Files.copy(dbPath.resolve(keyDbFile),
961-
destinationPath.resolve(keyDbFile),
962+
Files.copy(dbPath.resolve(certDbFile9),
963+
destinationPath.resolve(certDbFile9),
964+
StandardCopyOption.REPLACE_EXISTING);
965+
Files.copy(dbPath.resolve(keyDbFile3),
966+
destinationPath.resolve(keyDbFile3),
967+
StandardCopyOption.REPLACE_EXISTING);
968+
Files.copy(dbPath.resolve(keyDbFile4),
969+
destinationPath.resolve(keyDbFile4),
962970
StandardCopyOption.REPLACE_EXISTING);
963971
}
964972

test/jdk/sun/security/pkcs11/Provider/MultipleLogins.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ esac
9999

100100
# first make cert/key DBs writable
101101

102+
${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}cert9.db ${TESTCLASSES}
103+
${CHMOD} +w ${TESTCLASSES}${FS}cert9.db
104+
105+
${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}key4.db ${TESTCLASSES}
106+
${CHMOD} +w ${TESTCLASSES}${FS}key4.db
107+
102108
${CP} ${TESTSRC}${FS}..${FS}nss${FS}db${FS}cert8.db ${TESTCLASSES}
103109
${CHMOD} +w ${TESTCLASSES}${FS}cert8.db
104110

19 KB
Binary file not shown.
25 KB
Binary file not shown.
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
library=
22
name=NSS Internal PKCS #11 Module
3-
parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
4-
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})
3+
parameters=configdir='sql:./tmpdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
4+
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
5+
6+
library=libnssckbi.so
7+
name=Builtin Roots Module
8+
NSS=trustOrder=100

test/jdk/sun/security/pkcs11/SecmodTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class SecmodTest extends PKCS11Test {
3636
static String DBDIR;
3737
static char[] password = "test12".toCharArray();
3838
static String keyAlias = "mykey";
39-
static boolean useSqlite = false;
39+
static boolean useSqlite = true;
4040

4141
static void useSqlite(boolean b) {
4242
useSqlite = b;
28 KB
Binary file not shown.
36 KB
Binary file not shown.

0 commit comments

Comments
 (0)