changeset 11950:c86d82567b12 jdk8u112-b10

Merge
author asaha
date Mon, 22 Aug 2016 13:33:14 -0700
parents 9fd1f578d9e3 28e488c17b7a
children 532df0329e80
files .hgtags
diffstat 6 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 22 11:07:02 2016 -0700
+++ b/.hgtags	Mon Aug 22 13:33:14 2016 -0700
@@ -638,6 +638,7 @@
 1afe84012d643b4092dbf25f1cbb761508c19ed2 jdk8u111-b07
 9760ea9a63c0d48956392256bb7769ab40f2a2f7 jdk8u111-b08
 c959cff8f7accc5dc2a334a977a95fe1dcb9e812 jdk8u111-b09
+1f15a299d2bf9a8bed33a2bdf36745c8238aafbb jdk8u111-b10
 47e20a90bdbb2327289e330606b73a9fe4dc857e jdk8u112-b00
 96393e490afd4acba5b92c5ede68dc9bbb60a38e jdk8u112-b01
 b44d695f738baba091370828b84ae2c4cd715c1b jdk8u112-b02
--- a/src/share/lib/security/java.security-aix	Mon Aug 22 11:07:02 2016 -0700
+++ b/src/share/lib/security/java.security-aix	Mon Aug 22 13:33:14 2016 -0700
@@ -660,5 +660,4 @@
 # implementation. It is not guaranteed to be examined and used by other
 # implementations.
 #
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-      DSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
--- a/src/share/lib/security/java.security-linux	Mon Aug 22 11:07:02 2016 -0700
+++ b/src/share/lib/security/java.security-linux	Mon Aug 22 13:33:14 2016 -0700
@@ -660,5 +660,4 @@
 # implementation. It is not guaranteed to be examined and used by other
 # implementations.
 #
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-      DSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
--- a/src/share/lib/security/java.security-macosx	Mon Aug 22 11:07:02 2016 -0700
+++ b/src/share/lib/security/java.security-macosx	Mon Aug 22 13:33:14 2016 -0700
@@ -663,5 +663,4 @@
 # implementation. It is not guaranteed to be examined and used by other
 # implementations.
 #
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-      DSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
--- a/src/share/lib/security/java.security-solaris	Mon Aug 22 11:07:02 2016 -0700
+++ b/src/share/lib/security/java.security-solaris	Mon Aug 22 13:33:14 2016 -0700
@@ -662,5 +662,4 @@
 # implementation. It is not guaranteed to be examined and used by other
 # implementations.
 #
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-      DSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024
--- a/src/share/lib/security/java.security-windows	Mon Aug 22 11:07:02 2016 -0700
+++ b/src/share/lib/security/java.security-windows	Mon Aug 22 13:33:14 2016 -0700
@@ -663,5 +663,4 @@
 # implementation. It is not guaranteed to be examined and used by other
 # implementations.
 #
-jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024, \
-      DSA keySize < 1024
+jdk.jar.disabledAlgorithms=MD2, MD5, RSA keySize < 1024