diff --git a/src/share/lib/security/java.security-aix b/src/share/lib/security/java.security-aix index 609644a6929f83ec3b4bb97d2f8e569e39dadbdd..8f9cf76adf14970abae674d55ba2b1edcad46032 100644 --- a/src/share/lib/security/java.security-aix +++ b/src/share/lib/security/java.security-aix @@ -545,7 +545,7 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ # 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 acef8f0b41e03b4be7f3d07d86c6fb066abf1984..fb18f704c528bb8c12775db32d54cef52274ee3e 100644 --- a/src/share/lib/security/java.security-linux +++ b/src/share/lib/security/java.security-linux @@ -545,7 +545,7 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ # 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 42aff370b38876f1bda5469c6c6d5c72577a69fe..ef0267257c13357f5772be54df90b885b423d227 100644 --- a/src/share/lib/security/java.security-macosx +++ b/src/share/lib/security/java.security-macosx @@ -548,7 +548,7 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ # 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 f4e58665a8bd0649b208d2f8456518ccca46ace8..537386c04b863f3d1b0b3a66462d711b44fcb589 100644 --- a/src/share/lib/security/java.security-solaris +++ b/src/share/lib/security/java.security-solaris @@ -547,7 +547,7 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ # 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 8405da5533a2b26ada2619ac52e129ea6c5a5120..7bdda168ea2c32227e6d929619e8f5f8065432f4 100644 --- a/src/share/lib/security/java.security-windows +++ b/src/share/lib/security/java.security-windows @@ -548,7 +548,7 @@ jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \ # 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 6e5125723b2bd7a6e1ab0a9fc05c3ce290f08f6b..069dc79fcf4ab6a2970df33a382840729e5cf03a 100644 --- a/test/sun/security/tools/jarsigner/TimestampCheck.java +++ b/test/sun/security/tools/jarsigner/TimestampCheck.java @@ -60,7 +60,7 @@ import sun.security.x509.X500Name; /* * @test - * @bug 6543842 6543440 6939248 8009636 8024302 8163304 + * @bug 6543842 6543440 6939248 8009636 8024302 8163304 8169688 * @summary checking response of timestamp * @modules java.base/sun.security.pkcs * java.base/sun.security.timestamp @@ -345,8 +345,8 @@ public class TimestampCheck { .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");