|
 |
7318fd |
# HG changeset patch
|
|
|
7318fd |
# User Zdenek Zambersky <zzambers@redhat.com>
|
|
|
7318fd |
# Date 1601403587 -7200
|
|
|
7318fd |
# Tue Sep 29 20:19:47 2020 +0200
|
|
|
7318fd |
# Node ID f77ac813eee61b2e9616b2d71a2c5372d0cbd158
|
|
|
7318fd |
# Parent d484fdfcc7d5c21812de8a0712236d077b0f2dde
|
|
|
7318fd |
Fixed default policy for jdk.crypto.cryptoki
|
|
|
7318fd |
|
|
|
7318fd |
diff -r d484fdfcc7d5 -r f77ac813eee6 src/java.base/share/lib/security/default.policy
|
|
|
7318fd |
--- openjdk.orig/src/java.base/share/lib/security/default.policy Wed Sep 02 07:36:15 2020 +0200
|
|
|
7318fd |
+++ openjdk/src/java.base/share/lib/security/default.policy Tue Sep 29 20:19:47 2020 +0200
|
|
|
7318fd |
@@ -124,6 +124,8 @@
|
|
|
7318fd |
grant codeBase "jrt:/jdk.crypto.cryptoki" {
|
|
|
7318fd |
permission java.lang.RuntimePermission
|
|
|
7318fd |
"accessClassInPackage.sun.security.*";
|
|
|
7318fd |
+ permission java.lang.RuntimePermission
|
|
|
7318fd |
+ "accessClassInPackage.com.sun.crypto.provider";
|
|
|
7318fd |
permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch";
|
|
|
7318fd |
permission java.lang.RuntimePermission "loadLibrary.j2pkcs11";
|
|
|
7318fd |
permission java.util.PropertyPermission "sun.security.pkcs11.allowSingleThreadedModules", "read";
|
|
|
7318fd |
# HG changeset patch
|
|
|
7318fd |
# User Zdenek Zambersky <zzambers@redhat.com>
|
|
|
7318fd |
# Date 1601419086 -7200
|
|
|
7318fd |
# Wed Sep 30 00:38:06 2020 +0200
|
|
|
7318fd |
# Node ID 02c8b154f728be3dd06239a98519d654e2127186
|
|
|
7318fd |
# Parent f77ac813eee61b2e9616b2d71a2c5372d0cbd158
|
|
|
7318fd |
P11Util: Create provider in priviledged block
|
|
|
7318fd |
|
|
|
7318fd |
diff -r f77ac813eee6 -r 02c8b154f728 src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java
|
|
|
7318fd |
--- openjdk.orig/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java Tue Sep 29 20:19:47 2020 +0200
|
|
|
7318fd |
+++ openjdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Util.java Wed Sep 30 00:38:06 2020 +0200
|
|
|
7318fd |
@@ -87,14 +87,20 @@
|
|
|
7318fd |
}
|
|
|
7318fd |
p = Security.getProvider(providerName);
|
|
|
7318fd |
if (p == null) {
|
|
|
7318fd |
- try {
|
|
|
7318fd |
- @SuppressWarnings("deprecation")
|
|
|
7318fd |
- Object o = Class.forName(className).newInstance();
|
|
|
7318fd |
- p = (Provider)o;
|
|
|
7318fd |
- } catch (Exception e) {
|
|
|
7318fd |
- throw new ProviderException
|
|
|
7318fd |
- ("Could not find provider " + providerName, e);
|
|
|
7318fd |
- }
|
|
|
7318fd |
+ p = AccessController.doPrivileged(
|
|
|
7318fd |
+ new PrivilegedAction<Provider>() {
|
|
|
7318fd |
+ public Provider run() {
|
|
|
7318fd |
+ try {
|
|
|
7318fd |
+ @SuppressWarnings("deprecation")
|
|
|
7318fd |
+ Object o = Class.forName(className).newInstance();
|
|
|
7318fd |
+ return (Provider) o;
|
|
|
7318fd |
+ } catch (Exception e) {
|
|
|
7318fd |
+ throw new ProviderException
|
|
|
7318fd |
+ ("Could not find provider " + providerName, e);
|
|
|
7318fd |
+ }
|
|
|
7318fd |
+ }
|
|
|
7318fd |
+ }
|
|
|
7318fd |
+ );
|
|
|
7318fd |
}
|
|
|
7318fd |
return p;
|
|
|
7318fd |
}
|