changeset 57385:c5a6304b275a

8234870: Deprecate the OracleUcrypto JCE Provider for removal Reviewed-by: alanb, rriggs
author mullan
date Wed, 11 Dec 2019 17:17:28 -0500
parents edc6409771f7
children fd6d857ec82f
files src/java.base/share/conf/security/java.security src/jdk.crypto.ucrypto/solaris/classes/module-info.java
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/conf/security/java.security	Wed Dec 11 16:37:27 2019 -0500
+++ b/src/java.base/share/conf/security/java.security	Wed Dec 11 17:17:28 2019 -0500
@@ -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
--- a/src/jdk.crypto.ucrypto/solaris/classes/module-info.java	Wed Dec 11 16:37:27 2019 -0500
+++ b/src/jdk.crypto.ucrypto/solaris/classes/module-info.java	Wed Dec 11 17:17:28 2019 -0500
@@ -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;
 }