# HG changeset patch
# User mullan
# Date 1573670586 18000
# Node ID 27a266d5fb13c396423b6b75222b2a0eddaad0c8
# Parent  3f57daa2d6ebbf5dc6d81b30007a836d879d5038
8214483: Remove algorithms that use MD5 or DES from security requirements
Reviewed-by: xuelei

diff -r 3f57daa2d6eb -r 27a266d5fb13 src/java.base/share/classes/java/security/AlgorithmParameters.java
--- a/src/java.base/share/classes/java/security/AlgorithmParameters.java	Wed Nov 13 10:33:00 2019 -0800
+++ b/src/java.base/share/classes/java/security/AlgorithmParameters.java	Wed Nov 13 13:43:06 2019 -0500
@@ -51,7 +51,6 @@
  * following standard {@code AlgorithmParameters} algorithms:
  * <ul>
  * <li>{@code AES}</li>
- * <li>{@code DES}</li>
  * <li>{@code DESede}</li>
  * <li>{@code DiffieHellman}</li>
  * <li>{@code DSA}</li>
diff -r 3f57daa2d6eb -r 27a266d5fb13 src/java.base/share/classes/java/security/MessageDigest.java
--- a/src/java.base/share/classes/java/security/MessageDigest.java	Wed Nov 13 10:33:00 2019 -0800
+++ b/src/java.base/share/classes/java/security/MessageDigest.java	Wed Nov 13 13:43:06 2019 -0500
@@ -84,7 +84,6 @@
  * <p> Every implementation of the Java platform is required to support
  * the following standard {@code MessageDigest} algorithms:
  * <ul>
- * <li>{@code MD5}</li>
  * <li>{@code SHA-1}</li>
  * <li>{@code SHA-256}</li>
  * </ul>
diff -r 3f57daa2d6eb -r 27a266d5fb13 src/java.base/share/classes/javax/crypto/Cipher.java
--- a/src/java.base/share/classes/javax/crypto/Cipher.java	Wed Nov 13 10:33:00 2019 -0800
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java	Wed Nov 13 13:43:06 2019 -0500
@@ -147,10 +147,6 @@
  * <li>{@code AES/ECB/NoPadding} (128)</li>
  * <li>{@code AES/ECB/PKCS5Padding} (128)</li>
  * <li>{@code AES/GCM/NoPadding} (128)</li>
- * <li>{@code DES/CBC/NoPadding} (56)</li>
- * <li>{@code DES/CBC/PKCS5Padding} (56)</li>
- * <li>{@code DES/ECB/NoPadding} (56)</li>
- * <li>{@code DES/ECB/PKCS5Padding} (56)</li>
  * <li>{@code DESede/CBC/NoPadding} (168)</li>
  * <li>{@code DESede/CBC/PKCS5Padding} (168)</li>
  * <li>{@code DESede/ECB/NoPadding} (168)</li>
diff -r 3f57daa2d6eb -r 27a266d5fb13 src/java.base/share/classes/javax/crypto/KeyGenerator.java
--- a/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Wed Nov 13 10:33:00 2019 -0800
+++ b/src/java.base/share/classes/javax/crypto/KeyGenerator.java	Wed Nov 13 13:43:06 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -97,7 +97,6 @@
  * parentheses:
  * <ul>
  * <li>{@code AES} (128)</li>
- * <li>{@code DES} (56)</li>
  * <li>{@code DESede} (168)</li>
  * <li>{@code HmacSHA1}</li>
  * <li>{@code HmacSHA256}</li>
diff -r 3f57daa2d6eb -r 27a266d5fb13 src/java.base/share/classes/javax/crypto/Mac.java
--- a/src/java.base/share/classes/javax/crypto/Mac.java	Wed Nov 13 10:33:00 2019 -0800
+++ b/src/java.base/share/classes/javax/crypto/Mac.java	Wed Nov 13 13:43:06 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -56,7 +56,6 @@
  * <p> Every implementation of the Java platform is required to support
  * the following standard {@code Mac} algorithms:
  * <ul>
- * <li>{@code HmacMD5}</li>
  * <li>{@code HmacSHA1}</li>
  * <li>{@code HmacSHA256}</li>
  * </ul>
diff -r 3f57daa2d6eb -r 27a266d5fb13 src/java.base/share/classes/javax/crypto/SecretKeyFactory.java
--- a/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java	Wed Nov 13 10:33:00 2019 -0800
+++ b/src/java.base/share/classes/javax/crypto/SecretKeyFactory.java	Wed Nov 13 13:43:06 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -52,16 +52,13 @@
  * {@link #generateSecret(java.security.spec.KeySpec) generateSecret} and
  * {@link #getKeySpec(javax.crypto.SecretKey, java.lang.Class) getKeySpec}
  * methods.
- * For example, the DES secret-key factory supplied by the "SunJCE" provider
- * supports {@code DESKeySpec} as a transparent representation of DES
- * keys, and that provider's secret-key factory for Triple DES keys supports
- * {@code DESedeKeySpec} as a transparent representation of Triple DES
- * keys.
+ * For example, the DESede (Triple DES) secret-key factory supplied by the
+ * "SunJCE" provider supports {@code DESedeKeySpec} as a transparent
+ * representation of Triple DES keys.
  *
  * <p> Every implementation of the Java platform is required to support the
  * following standard {@code SecretKeyFactory} algorithms:
  * <ul>
- * <li>{@code DES}</li>
  * <li>{@code DESede}</li>
  * </ul>
  * These algorithms are described in the <a href=
@@ -74,7 +71,6 @@
  * @author Jan Luehe
  *
  * @see SecretKey
- * @see javax.crypto.spec.DESKeySpec
  * @see javax.crypto.spec.DESedeKeySpec
  * @see javax.crypto.spec.PBEKeySpec
  * @since 1.4