changeset 11967:60767ec3909b jdk8u112-b15

Merge
author asaha
date Thu, 22 Sep 2016 13:05:53 -0700
parents ef4e554722e0 d95f8359ca2c
children 5dd7e4bae5c2
files .hgtags
diffstat 6 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 21 14:34:39 2016 -0700
+++ b/.hgtags	Thu Sep 22 13:05:53 2016 -0700
@@ -642,6 +642,7 @@
 28e488c17b7a276e9ce00a0488bbc53094294e14 jdk8u111-b11
 b1304d71a2ec04ae6fa0a46120a5beba40a6f5ba jdk8u111-b12
 3f1a07c3a600abdc2eb204f9b67984e6b920846e jdk8u111-b13
+ab26fe28f9ed9c7d0a03ce47d1306427f86f27e9 jdk8u111-b14
 47e20a90bdbb2327289e330606b73a9fe4dc857e jdk8u112-b00
 96393e490afd4acba5b92c5ede68dc9bbb60a38e jdk8u112-b01
 b44d695f738baba091370828b84ae2c4cd715c1b jdk8u112-b02
--- a/src/share/lib/security/java.security-aix	Wed Sep 21 14:34:39 2016 -0700
+++ b/src/share/lib/security/java.security-aix	Thu Sep 22 13:05:53 2016 -0700
@@ -660,4 +660,4 @@
 # 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
--- a/src/share/lib/security/java.security-linux	Wed Sep 21 14:34:39 2016 -0700
+++ b/src/share/lib/security/java.security-linux	Thu Sep 22 13:05:53 2016 -0700
@@ -660,4 +660,4 @@
 # 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
--- a/src/share/lib/security/java.security-macosx	Wed Sep 21 14:34:39 2016 -0700
+++ b/src/share/lib/security/java.security-macosx	Thu Sep 22 13:05:53 2016 -0700
@@ -663,4 +663,4 @@
 # 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
--- a/src/share/lib/security/java.security-solaris	Wed Sep 21 14:34:39 2016 -0700
+++ b/src/share/lib/security/java.security-solaris	Thu Sep 22 13:05:53 2016 -0700
@@ -662,4 +662,4 @@
 # 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
--- a/src/share/lib/security/java.security-windows	Wed Sep 21 14:34:39 2016 -0700
+++ b/src/share/lib/security/java.security-windows	Thu Sep 22 13:05:53 2016 -0700
@@ -663,4 +663,4 @@
 # 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