infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-09 23:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8168078: Remove permission to read all system properties granted to the jdk.crypto.ec module

Browse Source 
Reviewed-by: vinnie, xuelei
This commit is contained in:
Sean Mullan 2016-10-18 09:18:56 -04:00
parent 9852310517
commit c8c8e0945e
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/src/java.base/share/lib/security/default.policy
View File

@ -103,7 +103,6 @@ grant codeBase "jrt:/jdk.crypto.ec" {
permission java.lang.RuntimePermission
"accessClassInPackage.sun.security.*";
permission java.lang.RuntimePermission "loadLibrary.sunec";
permission java.util.PropertyPermission "*", "read";
permission java.security.SecurityPermission "putProviderProperty.SunEC";
permission java.security.SecurityPermission "clearProviderProperties.SunEC";
permission java.security.SecurityPermission "removeProviderProperty.SunEC";

3
jdk/test/sun/security/ec/TestEC.java
View File

@ -28,7 +28,7 @@
/**
* @test
* @bug 6840752
* @bug 6840752 8168078
* @summary Provide out-of-the-box support for ECC algorithms
* @library ../pkcs11
* @library ../pkcs11/ec
@ -37,6 +37,7 @@
* @modules jdk.crypto.pkcs11/sun.security.pkcs11.wrapper
* @compile -XDignore.symbol.file TestEC.java
* @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
* @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
*/
import java.security.NoSuchProviderException;

3
jdk/test/sun/security/ec/TestEC.policy Normal file
View File

@ -0,0 +1,3 @@
grant codebase "file:${test.classes}/*" {
permission java.security.AllPermission;
};

3
jdk/test/sun/security/pkcs11/PKCS11Test.java
View File

@ -47,6 +47,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader;
import java.util.Set;
@ -112,7 +113,7 @@ public abstract class PKCS11Test {
found = true;
break;
}
} catch (Exception e) {
} catch (Exception | ServiceConfigurationError e) {
// ignore and move on to the next one
}
}