changeset 12518:bfd67d7c7d41 jdk8u152-b15

Merge
author asaha
date Tue, 05 Sep 2017 18:56:11 -0700
parents aeca286674ea 6e02d1974296
children 1cb70967c4d7
files .hgtags src/share/lib/security/java.security-aix src/share/lib/security/java.security-linux src/share/lib/security/java.security-macosx src/share/lib/security/java.security-solaris src/share/lib/security/java.security-windows
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 28 14:55:58 2017 +0100
+++ b/.hgtags	Tue Sep 05 18:56:11 2017 -0700
@@ -724,6 +724,7 @@
 a487770409082a3d1c4be9264e8eb02b1a41fe41 jdk8u151-b09
 7653488b327598fecd823b9b095a1c107b0a1429 jdk8u151-b10
 431c125e1231749e16427c280f115f93d699c0e1 jdk8u151-b11
+31bc1a681b51d2ae8b176ddeaf821d73494acde4 jdk8u151-b12
 1442bc728814af451e2dd1a6719a64485d27e3a0 jdk8u122-b00
 f6030acfa5aec0e64d45adfac69b9e7e5c12bc74 jdk8u122-b01
 6b072c3a6db7ab06804c91aab77431799dfb5d47 jdk8u122-b02
--- a/src/share/lib/security/java.security-aix	Mon Aug 28 14:55:58 2017 +0100
+++ b/src/share/lib/security/java.security-aix	Tue Sep 05 18:56:11 2017 -0700
@@ -799,8 +799,8 @@
 # Please see the JCA documentation for additional information on these
 # files and formats.
 #crypto.policy=unlimited
+
 #
-
 # The policy for the XML Signature secure validation mode. The mode is
 # enabled by setting the property "org.jcp.xml.dsig.secureValidation" to
 # true with the javax.xml.crypto.XMLCryptoContext.setProperty() method,