changeset 11204:5ceafca6a734 jdk8u66-b16

Merge
author asaha
date Mon, 28 Sep 2015 15:00:35 -0700
parents 7dc600287446 b6c540a802ad
children 59be3fa710a6
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Sep 21 21:50:25 2015 -0700
+++ b/.hgtags	Mon Sep 28 15:00:35 2015 -0700
@@ -473,6 +473,7 @@
 64ac5b0b4b9e7a587fc0606fada354c6fa4a7a86 jdk8u65-b13
 d26fd80f684d44fd9b16e84e585dda3757d4a19c jdk8u65-b14
 64c3b5808a701b6328c18028d1c98bc41679f718 jdk8u65-b15
+372d63c0daaff36677d40f5f05b051f5e4e9e4ea jdk8u65-b16
 e9f82302d5fdef8a0976640e09363895e9dcde3c jdk8u66-b00
 64d7bd4e98150447916f210e3bfd6875a4c2728a jdk8u66-b01
 d8210091911b14930192abd3138ee37c281fb632 jdk8u66-b02
--- a/src/share/lib/security/java.security-aix	Mon Sep 21 21:50:25 2015 -0700
+++ b/src/share/lib/security/java.security-aix	Mon Sep 28 15:00:35 2015 -0700
@@ -481,7 +481,7 @@
 #   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