/hg/icedtea8-forest/jdk: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Nov 3 02:49:25 UTC 2016
changeset 1c4d5cb2096a in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=1c4d5cb2096a
author: andrew
date: Wed Nov 02 03:31:54 2016 +0000
PR3183: Support Fedora/RHEL system crypto policy
changeset 32c84f7d918f in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=32c84f7d918f
author: andrew
date: Wed Nov 02 20:21:07 2016 +0000
PR3218: PR3159 leads to build failure on clean tree
changeset 3b149b4a3849 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=3b149b4a3849
author: andrew
date: Thu Nov 03 02:53:25 2016 +0000
Added tag icedtea-3.2.0pre03 for changeset 32c84f7d918f
diffstat:
.hgtags | 1 +
make/lib/CoreLibraries.gmk | 1 -
src/share/classes/java/security/Security.java | 33 +++++++++++++++++++++++++++
src/share/lib/security/java.security-aix | 7 +++++
src/share/lib/security/java.security-linux | 7 +++++
src/share/lib/security/java.security-macosx | 7 +++++
src/share/lib/security/java.security-solaris | 7 +++++
src/share/lib/security/java.security-windows | 7 +++++
8 files changed, 69 insertions(+), 1 deletions(-)
diffs (168 lines):
diff -r 3d53f19b4838 -r 3b149b4a3849 .hgtags
--- a/.hgtags Wed Oct 26 03:51:39 2016 +0100
+++ b/.hgtags Thu Nov 03 02:53:25 2016 +0000
@@ -656,3 +656,4 @@
8e12cb096db33b525ec010de5e857ef1cc985ddd jdk8u102-b12
901ecf04370c7c03c61e22ab87a266c355baff54 jdk8u102-b13
30e3b600c82978ab75d89b10b03059aa1620bc52 icedtea-3.2.0pre02
+32c84f7d918fdb8e501f5a512c8804305ec88286 icedtea-3.2.0pre03
diff -r 3d53f19b4838 -r 3b149b4a3849 make/lib/CoreLibraries.gmk
--- a/make/lib/CoreLibraries.gmk Wed Oct 26 03:51:39 2016 +0100
+++ b/make/lib/CoreLibraries.gmk Thu Nov 03 02:53:25 2016 +0000
@@ -119,7 +119,6 @@
$(JDK_TOPDIR)/src/share/native/java/lang/reflect \
$(JDK_TOPDIR)/src/share/native/java/io \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
- $(JDK_TOPDIR)/src/share/native/java/nio \
$(JDK_TOPDIR)/src/share/native/java/security \
$(JDK_TOPDIR)/src/share/native/common \
$(JDK_TOPDIR)/src/share/native/sun/misc \
diff -r 3d53f19b4838 -r 3b149b4a3849 src/share/classes/java/security/Security.java
--- a/src/share/classes/java/security/Security.java Wed Oct 26 03:51:39 2016 +0100
+++ b/src/share/classes/java/security/Security.java Thu Nov 03 02:53:25 2016 +0000
@@ -43,6 +43,9 @@
* implementation-specific location, which is typically the properties file
* {@code lib/security/java.security} in the Java installation directory.
*
+ * <p>Additional default values of security properties are read from a
+ * system-specific location, if available.</p>
+ *
* @author Benjamin Renaud
*/
@@ -52,6 +55,10 @@
private static final Debug sdebug =
Debug.getInstance("properties");
+ /* System property file*/
+ private static final String SYSTEM_PROPERTIES =
+ "/etc/crypto-policies/back-ends/java.config";
+
/* The java.security properties */
private static Properties props;
@@ -93,6 +100,7 @@
if (sdebug != null) {
sdebug.println("reading security properties file: " +
propFile);
+ sdebug.println(props.toString());
}
} catch (IOException e) {
if (sdebug != null) {
@@ -114,6 +122,31 @@
}
if ("true".equalsIgnoreCase(props.getProperty
+ ("security.useSystemPropertiesFile"))) {
+
+ // now load the system file, if it exists, so its values
+ // will win if they conflict with the earlier values
+ try (BufferedInputStream bis =
+ new BufferedInputStream(new FileInputStream(SYSTEM_PROPERTIES))) {
+ props.load(bis);
+ loadedProps = true;
+
+ if (sdebug != null) {
+ sdebug.println("reading system security properties file " +
+ SYSTEM_PROPERTIES);
+ sdebug.println(props.toString());
+ }
+ } catch (IOException e) {
+ if (sdebug != null) {
+ sdebug.println
+ ("unable to load security properties from " +
+ SYSTEM_PROPERTIES);
+ e.printStackTrace();
+ }
+ }
+ }
+
+ if ("true".equalsIgnoreCase(props.getProperty
("security.overridePropertiesFile"))) {
String extraPropFile = System.getProperty
diff -r 3d53f19b4838 -r 3b149b4a3849 src/share/lib/security/java.security-aix
--- a/src/share/lib/security/java.security-aix Wed Oct 26 03:51:39 2016 +0100
+++ b/src/share/lib/security/java.security-aix Thu Nov 03 02:53:25 2016 +0000
@@ -276,6 +276,13 @@
security.overridePropertiesFile=true
#
+# Determines whether this properties file will be appended to
+# using the system properties file stored at
+# /etc/crypto-policies/back-ends/java.config
+#
+security.useSystemPropertiesFile=false
+
+#
# Determines the default key and trust manager factory algorithms for
# the javax.net.ssl package.
#
diff -r 3d53f19b4838 -r 3b149b4a3849 src/share/lib/security/java.security-linux
--- a/src/share/lib/security/java.security-linux Wed Oct 26 03:51:39 2016 +0100
+++ b/src/share/lib/security/java.security-linux Thu Nov 03 02:53:25 2016 +0000
@@ -276,6 +276,13 @@
security.overridePropertiesFile=true
#
+# Determines whether this properties file will be appended to
+# using the system properties file stored at
+# /etc/crypto-policies/back-ends/java.config
+#
+security.useSystemPropertiesFile=true
+
+#
# Determines the default key and trust manager factory algorithms for
# the javax.net.ssl package.
#
diff -r 3d53f19b4838 -r 3b149b4a3849 src/share/lib/security/java.security-macosx
--- a/src/share/lib/security/java.security-macosx Wed Oct 26 03:51:39 2016 +0100
+++ b/src/share/lib/security/java.security-macosx Thu Nov 03 02:53:25 2016 +0000
@@ -279,6 +279,13 @@
security.overridePropertiesFile=true
#
+# Determines whether this properties file will be appended to
+# using the system properties file stored at
+# /etc/crypto-policies/back-ends/java.config
+#
+security.useSystemPropertiesFile=false
+
+#
# Determines the default key and trust manager factory algorithms for
# the javax.net.ssl package.
#
diff -r 3d53f19b4838 -r 3b149b4a3849 src/share/lib/security/java.security-solaris
--- a/src/share/lib/security/java.security-solaris Wed Oct 26 03:51:39 2016 +0100
+++ b/src/share/lib/security/java.security-solaris Thu Nov 03 02:53:25 2016 +0000
@@ -278,6 +278,13 @@
security.overridePropertiesFile=true
#
+# Determines whether this properties file will be appended to
+# using the system properties file stored at
+# /etc/crypto-policies/back-ends/java.config
+#
+security.useSystemPropertiesFile=false
+
+#
# Determines the default key and trust manager factory algorithms for
# the javax.net.ssl package.
#
diff -r 3d53f19b4838 -r 3b149b4a3849 src/share/lib/security/java.security-windows
--- a/src/share/lib/security/java.security-windows Wed Oct 26 03:51:39 2016 +0100
+++ b/src/share/lib/security/java.security-windows Thu Nov 03 02:53:25 2016 +0000
@@ -279,6 +279,13 @@
security.overridePropertiesFile=true
#
+# Determines whether this properties file will be appended to
+# using the system properties file stored at
+# /etc/crypto-policies/back-ends/java.config
+#
+security.useSystemPropertiesFile=false
+
+#
# Determines the default key and trust manager factory algorithms for
# the javax.net.ssl package.
#
More information about the distro-pkg-dev
mailing list