/hg/icedtea8-forest/jdk: 7 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jan 8 05:32:05 UTC 2019
changeset 0d8822fc248b in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=0d8822fc248b
author: andrew
date: Tue Jan 08 04:20:08 2019 +0000
Added tag icedtea-3.11.0pre00 for changeset 6e67500d0ed8
changeset 9d187819b7b4 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=9d187819b7b4
author: andrew
date: Tue Jan 08 04:22:49 2019 +0000
PR3667, PR3479, RH1486025: Backed out changeset 5dcb55da00c1
changeset d5e289d67bad in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=d5e289d67bad
author: andrew
date: Tue Jan 08 04:30:57 2019 +0000
PR3667, PR2934: Backed out changeset 7513dae3426b
changeset 10c503f63486 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=10c503f63486
author: andrew
date: Tue Jan 08 04:32:10 2019 +0000
PR3667, PR2899: Backed out changeset 9dc0eca5fa89
changeset 152024390a11 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=152024390a11
author: andrew
date: Tue Jan 08 04:33:37 2019 +0000
PR3667, PR2815: Backed out changeset 26e2e029ee25
changeset 81be427cff65 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=81be427cff65
author: andrew
date: Tue Jan 08 04:41:10 2019 +0000
PR3667, PR2127: Backed out changeset 0ff7720931e8
changeset 1a1eac5703fc in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=1a1eac5703fc
author: andrew
date: Tue Jan 08 04:48:43 2019 +0000
PR3667, PR1983: Backed out changeset 48c15869ecd5
diffstat:
.hgtags | 1 +
make/lib/SecurityLibraries.gmk | 19 +-
make/mapfiles/libsunec/mapfile-vers | 1 -
src/share/classes/sun/security/ec/SunEC.java | 6 -
src/share/native/sun/security/ec/ECC_JNI.cpp | 79 +-----
src/share/native/sun/security/ec/ecc_impl.h | 298 -----------------------
src/share/native/sun/security/ec/impl/ecc_impl.h | 271 ++++++++++++++++++++
src/solaris/javavm/export/jni_md.h | 5 -
8 files changed, 285 insertions(+), 395 deletions(-)
diffs (truncated from 867 to 500 lines):
diff -r e5c17cfa6af3 -r 1a1eac5703fc .hgtags
--- a/.hgtags Wed Dec 26 20:08:57 2018 +0000
+++ b/.hgtags Tue Jan 08 04:48:43 2019 +0000
@@ -988,3 +988,4 @@
af544b6bf744cddf59121f40dbf4e0ec0a2533b2 jdk8u191-b25
5eaf8c860c22512b8b5c82cdcdca8ddd4a99e754 jdk8u191-b11
6e67500d0ed8d970fb5cd9f6deee42e38af707fb icedtea-3.10.0
+6e67500d0ed8d970fb5cd9f6deee42e38af707fb icedtea-3.11.0pre00
diff -r e5c17cfa6af3 -r 1a1eac5703fc make/lib/SecurityLibraries.gmk
--- a/make/lib/SecurityLibraries.gmk Wed Dec 26 20:08:57 2018 +0000
+++ b/make/lib/SecurityLibraries.gmk Tue Jan 08 04:48:43 2019 +0000
@@ -229,17 +229,8 @@
ifeq ($(ENABLE_INTREE_EC), yes)
- BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec
-
- ifeq ($(USE_EXTERNAL_NSS), true)
- BUILD_LIBSUNEC_IMPL_DIR :=
- BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
- else
- BUILD_LIBSUNEC_IMPL_DIR := \
- $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
- BUILD_LIBSUNEC_FLAGS += \
+ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
-I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
- endif
#
# On sol-sparc...all libraries are compiled with -xregs=no%appl
@@ -255,8 +246,8 @@
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
LIBRARY := sunec, \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec/ECC_JNI.cpp \
- $(BUILD_LIBSUNEC_IMPL_DIR), \
+ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
+ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
LANG := C++, \
OPTIMIZATION := LOW, \
CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
@@ -268,8 +259,8 @@
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX := $(LIBCXX), \
- LDFLAGS_SUFFIX_linux := -lc $(NSS_LIBS), \
- LDFLAGS_SUFFIX_solaris := -lc $(NSS_LIBS), \
+ LDFLAGS_SUFFIX_linux := -lc, \
+ LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=sunec.dll" \
diff -r e5c17cfa6af3 -r 1a1eac5703fc make/mapfiles/libsunec/mapfile-vers
--- a/make/mapfiles/libsunec/mapfile-vers Wed Dec 26 20:08:57 2018 +0000
+++ b/make/mapfiles/libsunec/mapfile-vers Tue Jan 08 04:48:43 2019 +0000
@@ -31,7 +31,6 @@
Java_sun_security_ec_ECDSASignature_signDigest;
Java_sun_security_ec_ECDSASignature_verifySignedDigest;
Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
- Java_sun_security_ec_SunEC_initialize;
local:
*;
};
diff -r e5c17cfa6af3 -r 1a1eac5703fc src/share/classes/sun/security/ec/SunEC.java
--- a/src/share/classes/sun/security/ec/SunEC.java Wed Dec 26 20:08:57 2018 +0000
+++ b/src/share/classes/sun/security/ec/SunEC.java Tue Jan 08 04:48:43 2019 +0000
@@ -58,7 +58,6 @@
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
System.loadLibrary("sunec"); // check for native library
- initialize();
return null;
}
});
@@ -82,9 +81,4 @@
}
}
- /**
- * Initialize the native code.
- */
- private static native void initialize();
-
}
diff -r e5c17cfa6af3 -r 1a1eac5703fc src/share/native/sun/security/ec/ECC_JNI.cpp
--- a/src/share/native/sun/security/ec/ECC_JNI.cpp Wed Dec 26 20:08:57 2018 +0000
+++ b/src/share/native/sun/security/ec/ECC_JNI.cpp Tue Jan 08 04:48:43 2019 +0000
@@ -24,7 +24,7 @@
*/
#include <jni.h>
-#include "ecc_impl.h"
+#include "impl/ecc_impl.h"
#define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
#define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
@@ -32,13 +32,6 @@
#define INVALID_PARAMETER_EXCEPTION \
"java/security/InvalidParameterException"
#define KEY_EXCEPTION "java/security/KeyException"
-#define INTERNAL_ERROR "java/lang/InternalError"
-
-#ifdef SYSTEM_NSS
-#define SYSTEM_UNUSED(x) UNUSED(x)
-#else
-#define SYSTEM_UNUSED(x) x
-#endif
extern "C" {
@@ -56,13 +49,8 @@
/*
* Deep free of the ECParams struct
*/
-void FreeECParams(ECParams *ecparams, jboolean SYSTEM_UNUSED(freeStruct))
+void FreeECParams(ECParams *ecparams, jboolean freeStruct)
{
-#ifdef SYSTEM_NSS
- // Needs to be freed using the matching method to the one
- // that allocated it. PR_TRUE means the memory is zeroed.
- PORT_FreeArena(ecparams->arena, PR_TRUE);
-#else
// Use B_FALSE to free the SECItem->data element, but not the SECItem itself
// Use B_TRUE to free both
@@ -76,7 +64,6 @@
SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
if (freeStruct)
free(ecparams);
-#endif
}
jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem)
@@ -102,7 +89,7 @@
*/
JNIEXPORT jobjectArray
JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
- (JNIEnv *env, jclass UNUSED(clazz), jint UNUSED(keySize), jbyteArray encodedParams, jbyteArray seed)
+ (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
{
ECPrivateKey *privKey = NULL; // contains both public and private values
ECParams *ecparams = NULL;
@@ -134,17 +121,8 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Generate the new keypair (using the supplied seed)
-#ifdef SYSTEM_NSS
- if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
- != SECSuccess) {
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
- if (EC_NewKey(ecparams, &privKey) != SECSuccess) {
-#else
if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
jSeedLength, 0) != SECSuccess) {
-#endif
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
@@ -191,15 +169,10 @@
}
if (privKey) {
FreeECParams(&privKey->ecParams, false);
-#ifndef SYSTEM_NSS
- // The entire ECPrivateKey is allocated in the arena
- // when using system NSS, so only the in-tree version
- // needs to clear these manually.
SECITEM_FreeItem(&privKey->version, B_FALSE);
SECITEM_FreeItem(&privKey->privateValue, B_FALSE);
SECITEM_FreeItem(&privKey->publicValue, B_FALSE);
free(privKey);
-#endif
}
if (pSeedBuffer) {
@@ -217,7 +190,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDSASignature_signDigest
- (JNIEnv *env, jclass UNUSED(clazz), jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
+ (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed, jint timing)
{
jbyte* pDigestBuffer = NULL;
jint jDigestLength = env->GetArrayLength(digest);
@@ -276,18 +249,8 @@
env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
// Sign the digest (using the supplied seed)
-#ifdef SYSTEM_NSS
- if (RNG_RandomUpdate((unsigned char *) pSeedBuffer, jSeedLength)
- != SECSuccess) {
- ThrowException(env, KEY_EXCEPTION);
- goto cleanup;
- }
- if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item)
- != SECSuccess) {
-#else
if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
(unsigned char *) pSeedBuffer, jSeedLength, 0, timing) != SECSuccess) {
-#endif
ThrowException(env, KEY_EXCEPTION);
goto cleanup;
}
@@ -336,7 +299,7 @@
*/
JNIEXPORT jboolean
JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
- (JNIEnv *env, jclass UNUSED(clazz), jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+ (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
{
jboolean isValid = false;
@@ -393,10 +356,9 @@
cleanup:
{
- if (params_item.data) {
+ if (params_item.data)
env->ReleaseByteArrayElements(encodedParams,
(jbyte *) params_item.data, JNI_ABORT);
- }
if (pubKey.publicValue.data)
env->ReleaseByteArrayElements(publicKey,
@@ -422,7 +384,7 @@
*/
JNIEXPORT jbyteArray
JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
- (JNIEnv *env, jclass UNUSED(clazz), jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+ (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
{
jbyteArray jSecret = NULL;
ECParams *ecparams = NULL;
@@ -498,10 +460,9 @@
env->ReleaseByteArrayElements(publicKey,
(jbyte *) publicValue_item.data, JNI_ABORT);
- if (params_item.data) {
+ if (params_item.data)
env->ReleaseByteArrayElements(encodedParams,
(jbyte *) params_item.data, JNI_ABORT);
- }
if (ecparams)
FreeECParams(ecparams, true);
@@ -510,28 +471,4 @@
return jSecret;
}
-JNIEXPORT void
-JNICALL Java_sun_security_ec_SunEC_initialize
- (JNIEnv *env, jclass UNUSED(clazz))
-{
-#ifdef SYSTEM_NSS
- if (SECOID_Init() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
- if (RNG_RNGInit() != SECSuccess) {
- ThrowException(env, INTERNAL_ERROR);
- }
-#endif
-}
-
-JNIEXPORT void
-JNICALL JNI_OnUnload
- (JavaVM *vm, void *reserved)
-{
-#ifdef SYSTEM_NSS
- RNG_RNGShutdown();
- SECOID_Shutdown();
-#endif
-}
-
} /* extern "C" */
diff -r e5c17cfa6af3 -r 1a1eac5703fc src/share/native/sun/security/ec/ecc_impl.h
--- a/src/share/native/sun/security/ec/ecc_impl.h Wed Dec 26 20:08:57 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/* *********************************************************************
- *
- * The Original Code is the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1994-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Dr Vipul Gupta <vipul.gupta at sun.com> and
- * Douglas Stebila <douglas at stebila.ca>, Sun Microsystems Laboratories
- *
- * Last Modified Date from the Original Code: May 2017
- *********************************************************************** */
-
-#ifndef _ECC_IMPL_H
-#define _ECC_IMPL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-#ifdef SYSTEM_NSS
-#include <secitem.h>
-#include <secerr.h>
-#include <keythi.h>
-#ifdef LEGACY_NSS
-#include <softoken.h>
-#else
-#include <blapi.h>
-#endif
-#else
-#include "ecl-exp.h"
-#endif
-
-/*
- * Multi-platform definitions
- */
-#ifdef __linux__
-#define B_FALSE FALSE
-#define B_TRUE TRUE
-typedef unsigned char uint8_t;
-typedef unsigned long ulong_t;
-typedef enum { B_FALSE, B_TRUE } boolean_t;
-#endif /* __linux__ */
-
-#ifdef _ALLBSD_SOURCE
-#include <stdint.h>
-#define B_FALSE FALSE
-#define B_TRUE TRUE
-typedef unsigned long ulong_t;
-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-#endif /* _ALLBSD_SOURCE */
-
-#ifdef AIX
-#define B_FALSE FALSE
-#define B_TRUE TRUE
-typedef unsigned char uint8_t;
-typedef unsigned long ulong_t;
-#endif /* AIX */
-
-#ifdef _WIN32
-typedef unsigned char uint8_t;
-typedef unsigned long ulong_t;
-typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
-#define strdup _strdup /* Replace POSIX name with ISO C++ name */
-#endif /* _WIN32 */
-
-#ifndef _KERNEL
-#include <stdlib.h>
-#endif /* _KERNEL */
-
-#define EC_MAX_DIGEST_LEN 1024 /* max digest that can be signed */
-#define EC_MAX_POINT_LEN 145 /* max len of DER encoded Q */
-#define EC_MAX_VALUE_LEN 72 /* max len of ANSI X9.62 private value d */
-#define EC_MAX_SIG_LEN 144 /* max signature len for supported curves */
-#define EC_MIN_KEY_LEN 112 /* min key length in bits */
-#define EC_MAX_KEY_LEN 571 /* max key length in bits */
-#define EC_MAX_OID_LEN 10 /* max length of OID buffer */
-
-/*
- * Various structures and definitions from NSS are here.
- */
-
-#ifndef SYSTEM_NSS
-#ifdef _KERNEL
-#define PORT_ArenaAlloc(a, n, f) kmem_alloc((n), (f))
-#define PORT_ArenaZAlloc(a, n, f) kmem_zalloc((n), (f))
-#define PORT_ArenaGrow(a, b, c, d) NULL
-#define PORT_ZAlloc(n, f) kmem_zalloc((n), (f))
-#define PORT_Alloc(n, f) kmem_alloc((n), (f))
-#else
-#define PORT_ArenaAlloc(a, n, f) malloc((n))
-#define PORT_ArenaZAlloc(a, n, f) calloc(1, (n))
-#define PORT_ArenaGrow(a, b, c, d) NULL
-#define PORT_ZAlloc(n, f) calloc(1, (n))
-#define PORT_Alloc(n, f) malloc((n))
-#endif
-
-#define PORT_NewArena(b) (char *)12345
-#define PORT_ArenaMark(a) NULL
-#define PORT_ArenaUnmark(a, b)
-#define PORT_ArenaRelease(a, m)
-#define PORT_FreeArena(a, b)
-#define PORT_Strlen(s) strlen((s))
-#define PORT_SetError(e)
-
-#define PRBool boolean_t
-#define PR_TRUE B_TRUE
-#define PR_FALSE B_FALSE
-
-#ifdef _KERNEL
-#define PORT_Assert ASSERT
-#define PORT_Memcpy(t, f, l) bcopy((f), (t), (l))
-#else
-#define PORT_Assert assert
-#define PORT_Memcpy(t, f, l) memcpy((t), (f), (l))
-#endif
-
-#endif
-
-#define CHECK_OK(func) if (func == NULL) goto cleanup
-#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
-
-#ifndef SYSTEM_NSS
-typedef enum {
- siBuffer = 0,
- siClearDataBuffer = 1,
- siCipherDataBuffer = 2,
- siDERCertBuffer = 3,
- siEncodedCertBuffer = 4,
- siDERNameBuffer = 5,
- siEncodedNameBuffer = 6,
- siAsciiNameString = 7,
- siAsciiString = 8,
- siDEROID = 9,
- siUnsignedInteger = 10,
- siUTCTime = 11,
- siGeneralizedTime = 12
-} SECItemType;
-
-typedef struct SECItemStr SECItem;
-
-struct SECItemStr {
- SECItemType type;
- unsigned char *data;
- unsigned int len;
-};
-
-typedef SECItem SECKEYECParams;
-
-typedef enum { ec_params_explicit,
- ec_params_named
-} ECParamsType;
-
-typedef enum { ec_field_GFp = 1,
- ec_field_GF2m
-} ECFieldType;
-
-struct ECFieldIDStr {
- int size; /* field size in bits */
- ECFieldType type;
- union {
- SECItem prime; /* prime p for (GFp) */
- SECItem poly; /* irreducible binary polynomial for (GF2m) */
- } u;
- int k1; /* first coefficient of pentanomial or
- * the only coefficient of trinomial
- */
- int k2; /* two remaining coefficients of pentanomial */
- int k3;
-};
-typedef struct ECFieldIDStr ECFieldID;
-
-struct ECCurveStr {
- SECItem a; /* contains octet stream encoding of
- * field element (X9.62 section 4.3.3)
- */
- SECItem b;
- SECItem seed;
-};
-typedef struct ECCurveStr ECCurve;
-
-typedef void PRArenaPool;
-
-struct ECParamsStr {
- PRArenaPool * arena;
- ECParamsType type;
- ECFieldID fieldID;
- ECCurve curve;
- SECItem base;
- SECItem order;
- int cofactor;
- SECItem DEREncoding;
- ECCurveName name;
More information about the distro-pkg-dev
mailing list