archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8266459: Implement JEP 411: Deprecate the Security Manager for Removal

Browse source 
Co-authored-by: Sean Mullan <mullan@openjdk.org>
Co-authored-by: Lance Andersen <lancea@openjdk.org>
Co-authored-by: Weijun Wang <weijun@openjdk.org>
Reviewed-by: erikj, darcy, chegar, naoto, joehw, alanb, mchung, kcr, prr, lancea
This commit is contained in:
Weijun Wang 2021-06-02 11:57:31 +00:00
parent 19450b9951
commit 6765f90250
826 changed files with 2734 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/security/KeyStore.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2021, 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
@ -987,6 +987,7 @@ public class KeyStore {
* if no such property exists.
* @see java.security.Security security properties
*/
@SuppressWarnings("removal")
public static final String getDefaultType() {
String kstype;
kstype = AccessController.doPrivileged(new PrivilegedAction<>() {
@ -1956,6 +1957,7 @@ public class KeyStore {
* of either PasswordProtection or CallbackHandlerProtection; or
* if file does not exist or does not refer to a normal file
*/
@SuppressWarnings("removal")
public static Builder newInstance(String type, Provider provider,
File file, ProtectionParameter protection) {
if ((type == null) || (file == null) || (protection == null)) {
@ -2027,6 +2029,7 @@ public class KeyStore {
private final File file;
private ProtectionParameter protection;
private ProtectionParameter keyProtection;
@SuppressWarnings("removal")
private final AccessControlContext context;
private KeyStore keyStore;
@ -2035,7 +2038,7 @@ public class KeyStore {
FileBuilder(String type, Provider provider, File file,
ProtectionParameter protection,
AccessControlContext context) {
@SuppressWarnings("removal") AccessControlContext context) {
this.type = type;
this.provider = provider;
this.file = file;
@ -2043,6 +2046,7 @@ public class KeyStore {
this.context = context;
}
@SuppressWarnings("removal")
public synchronized KeyStore getKeyStore() throws KeyStoreException
{
if (keyStore != null) {
@ -2174,6 +2178,7 @@ public class KeyStore {
if ((type == null) || (protection == null)) {
throw new NullPointerException();
}
@SuppressWarnings("removal")
final AccessControlContext context = AccessController.getContext();
return new Builder() {
private volatile boolean getCalled;
@ -2218,6 +2223,7 @@ public class KeyStore {
}
};
@SuppressWarnings("removal")
public synchronized KeyStore getKeyStore()
throws KeyStoreException {
if (oldException != null) {