Merge

df2f015d · asaha · 501779b7 · 60df663f · df2f015d · df2f015d
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

.hgtags .hgtags +2 -0

src/share/lib/security/java.security-aix src/share/lib/security/java.security-aix +1 -1

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -478,6 +478,7 @@ ed9e7ba6a419a80cbcdc60f4634388af054bdc76 jdk8u65-b10
 64ac5b0b4b9e7a587fc0606fada354c6fa4a7a86 jdk8u65-b13
 d26fd80f684d44fd9b16e84e585dda3757d4a19c jdk8u65-b14
 64c3b5808a701b6328c18028d1c98bc41679f718 jdk8u65-b15
+372d63c0daaff36677d40f5f05b051f5e4e9e4ea jdk8u65-b16
 e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u66-b00
 64d7bd4e98150447916f210e3bfd6875a4c2728a jdk8u66-b01
 d8210091911b14930192abd3138ee37c281fb632 jdk8u66-b02
@@ -490,3 +491,4 @@ e77c306d8ce409a65166813cc3b5e9403f96246b jdk8u66-b11
 e951c898bb6ca7be2ce49ac23f8442c0bccad4e9 jdk8u66-b13
 371fc17e38ccf9a729e34c518f6942162ba6c225 jdk8u66-b14
 ea602badedd0cd0c352c072220a884e8f1335e33 jdk8u66-b15
+5ceafca6a734e13d51319df6afd40678d68f9851 jdk8u66-b16
--- a/src/share/lib/security/java.security-aix
+++ b/src/share/lib/security/java.security-aix
@@ -481,7 +481,7 @@ krb5.kdc.bad.policy = tryLast
 #   jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
 #
 #
-jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
+jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024

 # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
 # (SSL/TLS) processing