Merge

2148e28a · asaha · a35baaf9 · 69f63b74 · 2148e28a · 2148e28a
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

.hgtags .hgtags +1 -0

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

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -724,6 +724,7 @@ c6c870e267de694bc85dc4af23a648824063f95b jdk8u151-b06
 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
+++ b/src/share/lib/security/java.security-aix
@@ -799,8 +799,8 @@ jdk.tls.legacyAlgorithms= \
 # 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,