/hg/release/icedtea7-forest-2.6/jdk: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 21 10:25:51 UTC 2015
changeset c1787ebf3df9 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c1787ebf3df9
author: andrew
date: Mon Jul 20 00:11:26 2015 +0100
PR2487: Make jdk8 mode the default for jdk.tls.ephemeralDHKeySize
Summary: Backout 45680a70921daf8a5929b890de22c2fa5d117d82
changeset 61d3e001dee6 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=61d3e001dee6
author: andrew
date: Tue Jul 21 01:32:24 2015 +0100
PR2521: Systems with a GLib without libgio segfault when obtaining proxy information
changeset 08d0296ae3dd in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=08d0296ae3dd
author: andrew
date: Tue Jul 21 11:22:57 2015 +0100
Added tag icedtea-2.6.1 for changeset 61d3e001dee6
diffstat:
.hgtags | 1 +
src/share/classes/sun/security/ssl/ServerHandshaker.java | 19 ++++++++-------
src/solaris/native/common/deps/glib2/gio_fp.c | 10 +++++++-
src/solaris/native/common/deps/glib2/glib_fp.h | 7 ++---
src/solaris/native/sun/net/spi/DefaultProxySelector.c | 3 ++
5 files changed, 26 insertions(+), 14 deletions(-)
diffs (111 lines):
diff -r ff3cd846027a -r 08d0296ae3dd .hgtags
--- a/.hgtags Sun Jul 19 18:19:29 2015 +0100
+++ b/.hgtags Tue Jul 21 11:22:57 2015 +0100
@@ -627,3 +627,4 @@
ec192fcd997198899cc376b0afad2c53893dedad jdk7u85-b00
fc2855d592b09fe16d0d47a24d09466f776dcb54 jdk7u85-b01
2db5e90a399beb96d82086d2d961894246d0bfe5 icedtea-2.6-branchpoint
+61d3e001dee639fddfed46879c81bf3ac518e445 icedtea-2.6.1
diff -r ff3cd846027a -r 08d0296ae3dd src/share/classes/sun/security/ssl/ServerHandshaker.java
--- a/src/share/classes/sun/security/ssl/ServerHandshaker.java Sun Jul 19 18:19:29 2015 +0100
+++ b/src/share/classes/sun/security/ssl/ServerHandshaker.java Tue Jul 21 11:22:57 2015 +0100
@@ -120,15 +120,15 @@
String property = AccessController.doPrivileged(
new GetPropertyAction("jdk.tls.ephemeralDHKeySize"));
if (property == null || property.length() == 0) {
- useLegacyEphemeralDHKeys = true;
+ useLegacyEphemeralDHKeys = false;
useSmartEphemeralDHKeys = false;
customizedDHKeySize = -1;
} else if ("matched".equals(property)) {
useLegacyEphemeralDHKeys = false;
useSmartEphemeralDHKeys = true;
customizedDHKeySize = -1;
- } else if ("jdk8".equals(property)) {
- useLegacyEphemeralDHKeys = false;
+ } else if ("legacy".equals(property)) {
+ useLegacyEphemeralDHKeys = true;
useSmartEphemeralDHKeys = false;
customizedDHKeySize = -1;
} else {
@@ -1253,14 +1253,15 @@
* 768 bits ephemeral DH private keys were used to be used in
* ServerKeyExchange except that exportable ciphers max out at 512
* bits modulus values. We still adhere to this behavior in legacy
- * mode (system property "jdk.tls.ephemeralDHKeySize"
+ * mode (system property "jdk.tls.ephemeralDHKeySize" is defined
+ * as "legacy").
+ *
+ * Older versions of OpenJDK don't support DH keys bigger
+ * than 1024 bits. We have to consider the compatibility requirement.
+ * 1024 bits DH key is always used for non-exportable cipher suites
+ * in default mode (system property "jdk.tls.ephemeralDHKeySize"
* is not defined).
*
- * New JDK (JDK 8 and later) releases use a 1024 bit DH key for
- * non-exportable cipher suites in default mode and this can
- * be enabled when the system property "jdk.tls.ephemeralDHKeySize"
- * is defined as "jdk8".
- *
* However, if applications want more stronger strength, setting
* system property "jdk.tls.ephemeralDHKeySize" to "matched"
* is a workaround to use ephemeral DH key which size matches the
diff -r ff3cd846027a -r 08d0296ae3dd src/solaris/native/common/deps/glib2/gio_fp.c
--- a/src/solaris/native/common/deps/glib2/gio_fp.c Sun Jul 19 18:19:29 2015 +0100
+++ b/src/solaris/native/common/deps/glib2/gio_fp.c Tue Jul 21 11:22:57 2015 +0100
@@ -55,6 +55,7 @@
if (gio_handle == NULL) {
gio_handle = dlopen("libgio-2.0.so.0", RTLD_LAZY);
if (gio_handle == NULL) {
+ NATDEBUG("Couldn't find libgio; returning false\n")
return JNI_FALSE;
}
}
@@ -124,7 +125,14 @@
jboolean gsettings_init()
{
- gio_init();
+ jboolean gio_init_result;
+
+ gio_init_result = gio_init();
+ if (gio_init_result == JNI_FALSE)
+ {
+ NATDEBUG("gio_init failed; returning false\n")
+ return JNI_FALSE;
+ }
if (settings_new != NULL &&
settings_get_boolean != NULL &&
diff -r ff3cd846027a -r 08d0296ae3dd src/solaris/native/common/deps/glib2/glib_fp.h
--- a/src/solaris/native/common/deps/glib2/glib_fp.h Sun Jul 19 18:19:29 2015 +0100
+++ b/src/solaris/native/common/deps/glib2/glib_fp.h Tue Jul 21 11:22:57 2015 +0100
@@ -54,12 +54,11 @@
} GError;
#endif
-#ifndef g_type_init
+#ifndef USE_SYSTEM_GIO
+#ifndef USE_SYSTEM_GCONF
#define g_type_init (*type_init)
+#define g_free (*gfree)
#endif
-
-#ifndef g_free
-#define g_free (*gfree)
#endif
typedef void (*type_init_func)(void);
diff -r ff3cd846027a -r 08d0296ae3dd src/solaris/native/sun/net/spi/DefaultProxySelector.c
--- a/src/solaris/native/sun/net/spi/DefaultProxySelector.c Sun Jul 19 18:19:29 2015 +0100
+++ b/src/solaris/native/sun/net/spi/DefaultProxySelector.c Tue Jul 21 11:22:57 2015 +0100
@@ -231,6 +231,9 @@
}
} else {
if (gconf_client == NULL) {
+#ifdef NATIVE_SUPPORT_DEBUG
+ printf("g_type_init=%p\n", g_type_init);
+#endif
g_type_init();
gconf_client = gconf_client_get_default();
}
More information about the distro-pkg-dev
mailing list