Skip to content

Commit c6f0a35

Browse files
author
Matthew Donovan
committedAug 1, 2024
8333317: Test sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java failed with: Invalid ECDH ServerKeyExchange signature
Reviewed-by: rhalade
1 parent f174bbd commit c6f0a35

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed
 

‎test/jdk/ProblemList.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ com/sun/security/sasl/gsskerb/NoSecurityLayer.java 8039280 generic-
613613
sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all
614614
sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
615615

616-
sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8316183,8333317 generic-all
616+
sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8316183 linux-ppc64le
617617

618618
############################################################################
619619

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public abstract class PKCS11Test {
8282

8383
// Version of the NSS artifact. This coincides with the version of
8484
// the NSS version
85-
private static final String NSS_BUNDLE_VERSION = "3.96";
85+
private static final String NSS_BUNDLE_VERSION = "3.101";
8686
private static final String NSSLIB = "jpg.tests.jdk.nsslib";
8787

8888
static double nss_version = -1;

‎test/jdk/sun/security/pkcs11/Signature/TestDSAKeyLength.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -48,8 +48,12 @@ public static void main(String[] args) throws Exception {
4848

4949
@Override
5050
protected boolean skipTest(Provider provider) {
51-
if (isNSS(provider) && (getNSSVersion() == 0.0 || getNSSVersion() >= 3.14)) {
52-
System.out.println("Skip testing NSS " + getNSSVersion());
51+
double version = getNSSVersion();
52+
String[] versionStrs = Double.toString(version).split("\\.");
53+
int major = Integer.parseInt(versionStrs[0]);
54+
int minor = Integer.parseInt(versionStrs[1]);
55+
if (isNSS(provider) && (version == 0.0 || (major >= 3 && minor >= 14))) {
56+
System.out.println("Skip testing NSS " + version);
5357
return true;
5458
}
5559

0 commit comments

Comments
 (0)
Please sign in to comment.