Merge

.hgtags

@@ -642,6 +642,7 @@ c959cff8f7accc5dc2a334a977a95fe1dcb9e812 jdk8u111-b09
 28e488c17b7a276e9ce00a0488bbc53094294e14 jdk8u111-b11
 b1304d71a2ec04ae6fa0a46120a5beba40a6f5ba jdk8u111-b12
 3f1a07c3a600abdc2eb204f9b67984e6b920846e jdk8u111-b13
+ab26fe28f9ed9c7d0a03ce47d1306427f86f27e9 jdk8u111-b14
 47e20a90bdbb2327289e330606b73a9fe4dc857e jdk8u112-b00
 96393e490afd4acba5b92c5ede68dc9bbb60a38e jdk8u112-b01
 b44d695f738baba091370828b84ae2c4cd715c1b jdk8u112-b02

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

@@ -660,4 +660,4 @@ jdk.tls.legacyAlgorithms= \
 # 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

src/share/lib/security/java.security-linux

@@ -660,4 +660,4 @@ jdk.tls.legacyAlgorithms= \
 # 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

src/share/lib/security/java.security-macosx

@@ -663,4 +663,4 @@ jdk.tls.legacyAlgorithms= \
 # 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

src/share/lib/security/java.security-solaris

@@ -662,4 +662,4 @@ jdk.tls.legacyAlgorithms= \
 # 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

src/share/lib/security/java.security-windows

@@ -663,4 +663,4 @@ jdk.tls.legacyAlgorithms= \
 # 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