From dd321330ced993e7e755d6e9f685d32493aa4981 Mon Sep 17 00:00:00 2001 From: Sean Mullan Date: Wed, 11 Dec 2019 17:17:28 -0500 Subject: [PATCH] 8234870: Deprecate the OracleUcrypto JCE Provider for removal Reviewed-by: alanb, rriggs --- src/java.base/share/conf/security/java.security | 2 ++ src/jdk.crypto.ucrypto/solaris/classes/module-info.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security index 0715175d12f..9cd9a2883a5 100644 --- a/src/java.base/share/conf/security/java.security +++ b/src/java.base/share/conf/security/java.security @@ -61,6 +61,8 @@ # List of providers and their preference orders (see above): # #ifdef solaris +# Note: The OracleUcrypto provider is deprecated and subject to removal in +# a future version of the JDK. security.provider.tbd=OracleUcrypto security.provider.tbd=SunPKCS11 ${java.home}/conf/security/sunpkcs11-solaris.cfg #endif diff --git a/src/jdk.crypto.ucrypto/solaris/classes/module-info.java b/src/jdk.crypto.ucrypto/solaris/classes/module-info.java index e79f76bfb1e..f4f8579c42e 100644 --- a/src/jdk.crypto.ucrypto/solaris/classes/module-info.java +++ b/src/jdk.crypto.ucrypto/solaris/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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 @@ -29,7 +29,10 @@ * @provides java.security.Provider * @moduleGraph * @since 9 + * @deprecated This module is deprecated and subject to removal in a future + * version of the JDK. See JEP 362 for more information. */ +@Deprecated(since="14", forRemoval=true) module jdk.crypto.ucrypto { provides java.security.Provider with com.oracle.security.ucrypto.UcryptoProvider; }