/hg/icedtea8-forest/jdk: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 5 01:35:01 UTC 2016
changeset 31b9df757430 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=31b9df757430
author: darcy
date: Mon Jul 04 16:17:25 2016 +0100
8129822, PR3077: Define "headful" jtreg keyword
Reviewed-by: alanb, alexsch
changeset bc6eab2038c6 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=bc6eab2038c6
author: aph
date: Mon Jul 04 17:08:12 2016 +0100
8158260, PR2991, RH1341258: PPC64: unaligned Unsafe.getInt can lead to the generation of illegal instructions
Summary: Adjust instruction generation. Includes portions of 8026049 for test case.
Reviewed-by: dholmes, jrose, psandoz, kvn
changeset a4541d1d8609 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=a4541d1d8609
author: andrew
date: Mon Jul 04 18:21:29 2016 +0100
PR3083, RH1346460: Regression in SSL debug output without an ECC provider
Summary: Return null rather than throwing an exception when there's no ECC provider.
diffstat:
src/share/classes/java/nio/Bits.java | 35 +--------
src/share/classes/sun/misc/Unsafe.java | 23 ++++++
src/share/classes/sun/security/provider/ByteArrayAccess.java | 9 +-
src/share/classes/sun/security/util/Debug.java | 1 +
src/share/classes/sun/security/util/ECUtil.java | 44 +++++++++++-
test/TEST.ROOT | 5 +-
6 files changed, 76 insertions(+), 41 deletions(-)
diffs (279 lines):
diff -r 466f80a29e6b -r a4541d1d8609 src/share/classes/java/nio/Bits.java
--- a/src/share/classes/java/nio/Bits.java Fri Apr 29 09:46:14 2016 -0700
+++ b/src/share/classes/java/nio/Bits.java Mon Jul 04 18:21:29 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -567,32 +567,13 @@
// -- Processor and memory-system properties --
- private static final ByteOrder byteOrder;
+ private static final ByteOrder byteOrder
+ = unsafe.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
static ByteOrder byteOrder() {
- if (byteOrder == null)
- throw new Error("Unknown byte order");
return byteOrder;
}
- static {
- long a = unsafe.allocateMemory(8);
- try {
- unsafe.putLong(a, 0x0102030405060708L);
- byte b = unsafe.getByte(a);
- switch (b) {
- case 0x01: byteOrder = ByteOrder.BIG_ENDIAN; break;
- case 0x08: byteOrder = ByteOrder.LITTLE_ENDIAN; break;
- default:
- assert false;
- byteOrder = null;
- }
- } finally {
- unsafe.freeMemory(a);
- }
- }
-
-
private static int pageSize = -1;
static int pageSize() {
@@ -605,17 +586,9 @@
return (int)(size + (long)pageSize() - 1L) / pageSize();
}
- private static boolean unaligned;
- private static boolean unalignedKnown = false;
+ private static boolean unaligned = unsafe.unalignedAccess();
static boolean unaligned() {
- if (unalignedKnown)
- return unaligned;
- String arch = AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("os.arch"));
- unaligned = arch.equals("i386") || arch.equals("x86")
- || arch.equals("amd64") || arch.equals("x86_64");
- unalignedKnown = true;
return unaligned;
}
diff -r 466f80a29e6b -r a4541d1d8609 src/share/classes/sun/misc/Unsafe.java
--- a/src/share/classes/sun/misc/Unsafe.java Fri Apr 29 09:46:14 2016 -0700
+++ b/src/share/classes/sun/misc/Unsafe.java Mon Jul 04 18:21:29 2016 +0100
@@ -1142,4 +1142,27 @@
throw new IllegalAccessError();
}
+ /**
+ * @return Returns true if the native byte ordering of this
+ * platform is big-endian, false if it is little-endian.
+ */
+ public final boolean isBigEndian() { return BE; }
+
+ /**
+ * @return Returns true if this platform is capable of performing
+ * accesses at addresses which are not aligned for the type of the
+ * primitive type being accessed, false otherwise.
+ */
+ public final boolean unalignedAccess() { return unalignedAccess; }
+
+ // JVM interface methods
+ private native boolean unalignedAccess0();
+ private native boolean isBigEndian0();
+
+ // BE is true iff the native endianness of this platform is big.
+ private static final boolean BE = theUnsafe.isBigEndian0();
+
+ // unalignedAccess is true iff this platform can perform unaligned accesses.
+ private static final boolean unalignedAccess = theUnsafe.unalignedAccess0();
+
}
diff -r 466f80a29e6b -r a4541d1d8609 src/share/classes/sun/security/provider/ByteArrayAccess.java
--- a/src/share/classes/sun/security/provider/ByteArrayAccess.java Fri Apr 29 09:46:14 2016 -0700
+++ b/src/share/classes/sun/security/provider/ByteArrayAccess.java Mon Jul 04 18:21:29 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -88,13 +88,8 @@
// Return whether this platform supports full speed int/long memory access
// at unaligned addresses.
- // This code was copied from java.nio.Bits because there is no equivalent
- // public API.
private static boolean unaligned() {
- String arch = java.security.AccessController.doPrivileged
- (new sun.security.action.GetPropertyAction("os.arch", ""));
- return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
- || arch.equals("x86_64");
+ return unsafe.unalignedAccess();
}
/**
diff -r 466f80a29e6b -r a4541d1d8609 src/share/classes/sun/security/util/Debug.java
--- a/src/share/classes/sun/security/util/Debug.java Fri Apr 29 09:46:14 2016 -0700
+++ b/src/share/classes/sun/security/util/Debug.java Mon Jul 04 18:21:29 2016 +0100
@@ -73,6 +73,7 @@
System.err.println("certpath PKIX CertPathBuilder and");
System.err.println(" CertPathValidator debugging");
System.err.println("combiner SubjectDomainCombiner debugging");
+ System.err.println("ecc Elliptic Curve Cryptography debugging");
System.err.println("gssloginconfig");
System.err.println(" GSS LoginConfigImpl debugging");
System.err.println("configfile JAAS ConfigFile loading");
diff -r 466f80a29e6b -r a4541d1d8609 src/share/classes/sun/security/util/ECUtil.java
--- a/src/share/classes/sun/security/util/ECUtil.java Fri Apr 29 09:46:14 2016 -0700
+++ b/src/share/classes/sun/security/util/ECUtil.java Mon Jul 04 18:21:29 2016 +0100
@@ -41,6 +41,9 @@
public class ECUtil {
+ /* Are we debugging ? */
+ private static final Debug debug = Debug.getInstance("ecc");
+
// Used by SunPKCS11 and SunJSSE.
public static ECPoint decodePoint(byte[] data, EllipticCurve curve)
throws IOException {
@@ -90,6 +93,10 @@
}
private static AlgorithmParameters getECParameters(Provider p) {
+ return getECParameters(p, false);
+ }
+
+ private static AlgorithmParameters getECParameters(Provider p, boolean throwException) {
try {
if (p != null) {
return AlgorithmParameters.getInstance("EC", p);
@@ -97,13 +104,21 @@
return AlgorithmParameters.getInstance("EC");
} catch (NoSuchAlgorithmException nsae) {
- throw new RuntimeException(nsae);
+ if (throwException) {
+ throw new RuntimeException(nsae);
+ } else {
+ // ECC provider is optional so just return null
+ if (debug != null) {
+ debug.println("Provider unavailable: " + nsae);
+ }
+ return null;
+ }
}
}
public static byte[] encodeECParameterSpec(Provider p,
ECParameterSpec spec) {
- AlgorithmParameters parameters = getECParameters(p);
+ AlgorithmParameters parameters = getECParameters(p, true);
try {
parameters.init(spec);
@@ -122,11 +137,16 @@
public static ECParameterSpec getECParameterSpec(Provider p,
ECParameterSpec spec) {
AlgorithmParameters parameters = getECParameters(p);
+ if (parameters == null)
+ return null;
try {
parameters.init(spec);
return parameters.getParameterSpec(ECParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
+ if (debug != null) {
+ debug.println("Invalid parameter specification: " + ipse);
+ }
return null;
}
}
@@ -135,34 +155,49 @@
byte[] params)
throws IOException {
AlgorithmParameters parameters = getECParameters(p);
+ if (parameters == null)
+ return null;
parameters.init(params);
try {
return parameters.getParameterSpec(ECParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
+ if (debug != null) {
+ debug.println("Invalid parameter specification: " + ipse);
+ }
return null;
}
}
public static ECParameterSpec getECParameterSpec(Provider p, String name) {
AlgorithmParameters parameters = getECParameters(p);
+ if (parameters == null)
+ return null;
try {
parameters.init(new ECGenParameterSpec(name));
return parameters.getParameterSpec(ECParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
+ if (debug != null) {
+ debug.println("Invalid parameter specification: " + ipse);
+ }
return null;
}
}
public static ECParameterSpec getECParameterSpec(Provider p, int keySize) {
AlgorithmParameters parameters = getECParameters(p);
+ if (parameters == null)
+ return null;
try {
parameters.init(new ECKeySizeParameterSpec(keySize));
return parameters.getParameterSpec(ECParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
+ if (debug != null) {
+ debug.println("Invalid parameter specification: " + ipse);
+ }
return null;
}
@@ -171,11 +206,16 @@
public static String getCurveName(Provider p, ECParameterSpec spec) {
ECGenParameterSpec nameSpec;
AlgorithmParameters parameters = getECParameters(p);
+ if (parameters == null)
+ return null;
try {
parameters.init(spec);
nameSpec = parameters.getParameterSpec(ECGenParameterSpec.class);
} catch (InvalidParameterSpecException ipse) {
+ if (debug != null) {
+ debug.println("Invalid parameter specification: " + ipse);
+ }
return null;
}
diff -r 466f80a29e6b -r a4541d1d8609 test/TEST.ROOT
--- a/test/TEST.ROOT Fri Apr 29 09:46:14 2016 -0700
+++ b/test/TEST.ROOT Mon Jul 04 18:21:29 2016 +0100
@@ -1,8 +1,11 @@
# This file identifies the root of the test-suite hierarchy.
# It also contains test-suite configuration information.
+#
+# A "headful" test requires a graphical environment to meaningfully
+# run. Tests that are not headful are "headless."
# The list of keywords supported in the entire test suite
-keys=2d dnd i18n
+keys=2d dnd i18n headful
# Tests that must run in othervm mode
othervm.dirs=java/awt java/beans java/rmi javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces sun/rmi
More information about the distro-pkg-dev
mailing list