infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-06 08:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8228645: Don't run sun/security/pkcs11/Cipher/TestKATForGCM.java on buggy NSS solaris versions

Browse Source 
Reviewed-by: valeriep
This commit is contained in:
Sean Coffey 2019-07-29 08:17:26 +00:00
parent dde37610c0
commit bb3d5aed04
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/jdk/sun/security/pkcs11/Cipher/TestKATForGCM.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -314,8 +314,20 @@ public class TestKATForGCM extends PKCS11Test {
", no support for " + transformation);
return;
}
if (execute(testValues, c)) {
System.out.println("Test Passed!");
try {
if (execute(testValues, c)) {
System.out.println("Test Passed!");
}
} catch (Exception e) {
double ver = getNSSInfo("nss");
if (ver < 3.251d && p.getName().contains("SunPKCS11-NSS") &&
System.getProperty("os.name").equals("SunOS")) {
// buggy behaviour from solaris on 11.2 OS (nss < 3.251)
System.out.println("Skipping: SunPKCS11-NSS: Old NSS: " + ver);
return; // OK
} else {
throw e;
}
}
}
}