File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed
test/jdk/sun/security/pkcs11 Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ public abstract class PKCS11Test {
7777
7878 // Version of the NSS artifact. This coincides with the version of
7979 // the NSS version
80- private static final String NSS_BUNDLE_VERSION = "3.96 " ;
80+ private static final String NSS_BUNDLE_VERSION = "3.101 " ;
8181 private static final String NSSLIB = "jpg.tests.jdk.nsslib" ;
8282
8383 static double nss_version = -1 ;
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments