8169688: Backout (remove) MD5 from jdk.jar.disabledAlgorithms for January CPU
Reviewed-by: igerasim
diff --git a/src/share/lib/security/java.security-aix b/src/share/lib/security/java.security-aix
index 609644a..8f9cf76 100644
--- a/src/share/lib/security/java.security-aix
+++ b/src/share/lib/security/java.security-aix
@@ -545,7 +545,7 @@
# implementation. It is not guaranteed to be examined and used by other
# implementations.
#
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing
diff --git a/src/share/lib/security/java.security-linux b/src/share/lib/security/java.security-linux
index acef8f0..fb18f70 100644
--- a/src/share/lib/security/java.security-linux
+++ b/src/share/lib/security/java.security-linux
@@ -545,7 +545,7 @@
# implementation. It is not guaranteed to be examined and used by other
# implementations.
#
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing
diff --git a/src/share/lib/security/java.security-macosx b/src/share/lib/security/java.security-macosx
index 42aff37..ef02672 100644
--- a/src/share/lib/security/java.security-macosx
+++ b/src/share/lib/security/java.security-macosx
@@ -548,7 +548,7 @@
# implementation. It is not guaranteed to be examined and used by other
# implementations.
#
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing
diff --git a/src/share/lib/security/java.security-solaris b/src/share/lib/security/java.security-solaris
index f4e5866..537386c 100644
--- a/src/share/lib/security/java.security-solaris
+++ b/src/share/lib/security/java.security-solaris
@@ -547,7 +547,7 @@
# implementation. It is not guaranteed to be examined and used by other
# implementations.
#
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing
diff --git a/src/share/lib/security/java.security-windows b/src/share/lib/security/java.security-windows
index 8405da5..7bdda16 100644
--- a/src/share/lib/security/java.security-windows
+++ b/src/share/lib/security/java.security-windows
@@ -548,7 +548,7 @@
# implementation. It is not guaranteed to be examined and used by other
# implementations.
#
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing
diff --git a/test/sun/security/tools/jarsigner/TimestampCheck.java b/test/sun/security/tools/jarsigner/TimestampCheck.java
index a2cf555..321df20 100644
--- a/test/sun/security/tools/jarsigner/TimestampCheck.java
+++ b/test/sun/security/tools/jarsigner/TimestampCheck.java
@@ -60,7 +60,7 @@
/*
* @test
- * @bug 6543842 6543440 6939248 8009636 8024302 8163304 8169911
+ * @bug 6543842 6543440 6939248 8009636 8024302 8163304 8169911 8169688
* @summary checking response of timestamp
* @modules java.base/sun.security.pkcs
* java.base/sun.security.timestamp
@@ -345,8 +345,8 @@
.shouldHaveExitValue(0);
checkTimestamp("tsaalg.jar", defaultPolicyId, "SHA-1");
- sign("weak", "-digestalg", "MD5",
- "-sigalg", "MD5withRSA", "-tsadigestalg", "MD5")
+ sign("weak", "-digestalg", "MD2",
+ "-sigalg", "MD2withRSA", "-tsadigestalg", "MD2")
.shouldHaveExitValue(0);
checkWeak("weak.jar");