/hg/release/icedtea7-forest-2.5/jdk: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Sep 19 19:07:00 UTC 2014
changeset f37b9f3ff913 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f37b9f3ff913
author: andrew
date: Wed Aug 27 16:20:16 2014 +0100
4963723: Implement SHA-224
Summary: Add support for SHA-224, SHA224withRSA, SHA224withECDSA, HmacSHA224 and OAEPwithSHA-224AndMGF1Padding.
Reviewed-by: vinnie
Original-by: valeriep
changeset 8692818e60c5 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=8692818e60c5
author: andrew
date: Wed Aug 27 18:40:41 2014 +0100
7044060: Need to support NSA Suite B Cryptography algorithms
Summary: Add support for DSA parameter generation and OIDs for NSA Suite B algorithms.
Reviewed-by: vinnie
Original-by: valeriep
changeset c24a5c865b22 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=c24a5c865b22
author: xuelei
date: Thu Apr 18 22:23:56 2013 -0700
8006935: Need to take care of long secret keys in HMAC/PRF compuation
Reviewed-by: valeriep
changeset 9332dff476b5 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9332dff476b5
author: andrew
date: Mon Sep 08 18:46:06 2014 +0100
PR1989: Make jdk_generic_profile.sh handle missing programs better and be more verbose
changeset 0312f617199a in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=0312f617199a
author: andrew
date: Wed Sep 10 17:12:24 2014 +0100
PR1992, RH735336: Support retrieving proxy settings on GNOME 3.12.2
changeset d743166ebdd2 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d743166ebdd2
author: andrew
date: Wed Sep 17 15:43:58 2014 +0100
PR2003: --disable-system-gtk option broken by refactoring in PR1736
changeset 5a15406ba951 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=5a15406ba951
author: andrew
date: Fri Sep 19 02:38:01 2014 +0100
PR2009: Checksum of policy JAR files changes on every build
changeset fa4e5dae68e1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=fa4e5dae68e1
author: andrew
date: Fri Sep 19 20:06:43 2014 +0100
Bump to 2.5.3pre01
diffstat:
make/javax/crypto/Makefile | 63 +-
make/jdk_generic_profile.sh | 84 +-
make/sun/gtk/Makefile | 2 +
src/share/classes/com/sun/crypto/provider/AESCipher.java | 113 +-
src/share/classes/com/sun/crypto/provider/AESWrapCipher.java | 36 +-
src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java | 17 +-
src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java | 10 +-
src/share/classes/com/sun/crypto/provider/HmacCore.java | 159 +-
src/share/classes/com/sun/crypto/provider/HmacMD5.java | 92 +-
src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java | 81 +-
src/share/classes/com/sun/crypto/provider/HmacSHA1.java | 92 +-
src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java | 63 +-
src/share/classes/com/sun/crypto/provider/OAEPParameters.java | 4 +-
src/share/classes/com/sun/crypto/provider/SunJCE.java | 95 +-
src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java | 21 +-
src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java | 16 +-
src/share/classes/java/security/spec/MGF1ParameterSpec.java | 3 +-
src/share/classes/java/security/spec/PSSParameterSpec.java | 3 +-
src/share/classes/sun/security/ec/ECDSASignature.java | 10 +-
src/share/classes/sun/security/ec/SunECEntries.java | 20 +-
src/share/classes/sun/security/pkcs11/P11Cipher.java | 34 +-
src/share/classes/sun/security/pkcs11/P11Digest.java | 5 +-
src/share/classes/sun/security/pkcs11/P11Mac.java | 9 +-
src/share/classes/sun/security/pkcs11/P11Signature.java | 10 +
src/share/classes/sun/security/pkcs11/SunPKCS11.java | 72 +-
src/share/classes/sun/security/pkcs11/wrapper/Functions.java | 7 +-
src/share/classes/sun/security/provider/DSA.java | 810 +++++----
src/share/classes/sun/security/provider/DSAKeyPairGenerator.java | 92 +-
src/share/classes/sun/security/provider/DSAParameterGenerator.java | 269 +-
src/share/classes/sun/security/provider/DigestBase.java | 27 +-
src/share/classes/sun/security/provider/MD2.java | 21 +-
src/share/classes/sun/security/provider/MD4.java | 18 +-
src/share/classes/sun/security/provider/MD5.java | 18 +-
src/share/classes/sun/security/provider/ParameterCache.java | 166 +-
src/share/classes/sun/security/provider/SHA.java | 19 +-
src/share/classes/sun/security/provider/SHA2.java | 72 +-
src/share/classes/sun/security/provider/SHA5.java | 38 +-
src/share/classes/sun/security/provider/SunEntries.java | 46 +-
src/share/classes/sun/security/rsa/RSASignature.java | 13 +-
src/share/classes/sun/security/rsa/SunRsaSignEntries.java | 8 +-
src/share/classes/sun/security/spec/DSAGenParameterSpec.java | 129 +
src/share/classes/sun/security/x509/AlgorithmId.java | 49 +-
src/solaris/native/common/deps/gtk2/gtk_fp.c | 3 -
src/solaris/native/common/deps/gtk2/gtk_fp.h | 10 +-
src/solaris/native/common/deps/gtk2/gtk_fp_check.c | 2 +
src/solaris/native/common/deps/gtk2/gtk_fp_check.h | 17 +
src/solaris/native/sun/net/spi/DefaultProxySelector.c | 97 +-
src/windows/classes/sun/security/mscapi/RSASignature.java | 13 +-
src/windows/classes/sun/security/mscapi/SunMSCAPI.java | 20 +-
test/com/sun/crypto/provider/Cipher/RSA/TestOAEP.java | 16 +-
test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java | 3 +-
test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java | 6 +-
test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java | 24 +-
test/com/sun/crypto/provider/KeyGenerator/Test4628062.java | 68 +-
test/com/sun/crypto/provider/Mac/MacClone.java | 46 +-
test/com/sun/crypto/provider/Mac/MacKAT.java | 29 +-
test/sun/security/mscapi/SignUsingNONEwithRSA.java | 8 +-
test/sun/security/mscapi/SignUsingSHA2withRSA.java | 6 +-
test/sun/security/pkcs11/MessageDigest/DigestKAT.java | 8 +-
test/sun/security/pkcs11/MessageDigest/TestCloning.java | 2 +-
test/sun/security/pkcs11/Signature/TestRSAKeyLength.java | 4 +-
test/sun/security/pkcs11/ec/TestCurves.java | 3 +-
test/sun/security/pkcs11/ec/TestECDH2.java | 127 +
test/sun/security/pkcs11/ec/TestECDSA2.java | 122 +
test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java | 3 +-
test/sun/security/pkcs11/rsa/TestSignatures.java | 3 +-
test/sun/security/provider/DSA/TestAlgParameterGenerator.java | 117 +
test/sun/security/provider/DSA/TestDSA2.java | 96 +
test/sun/security/provider/DSA/TestKeyPairGenerator.java | 6 +-
test/sun/security/provider/MessageDigest/DigestKAT.java | 10 +-
test/sun/security/provider/MessageDigest/Offsets.java | 3 +-
test/sun/security/provider/MessageDigest/TestSHAClone.java | 6 +-
test/sun/security/rsa/TestKeyPairGenerator.java | 5 +-
test/sun/security/rsa/TestSignatures.java | 5 +-
74 files changed, 2450 insertions(+), 1354 deletions(-)
diffs (truncated from 6289 to 500 lines):
diff -r eb70b48e4211 -r fa4e5dae68e1 make/javax/crypto/Makefile
--- a/make/javax/crypto/Makefile Wed Sep 03 15:34:29 2014 +0100
+++ b/make/javax/crypto/Makefile Fri Sep 19 20:06:43 2014 +0100
@@ -258,6 +258,8 @@
POLICY_DESTDIR = $(LIBDIR)/security
UNSIGNED_POLICY_BUILDDIR = $(UNSIGNED_DIR)/policy
+TEMPDIR_UNLIMITED = $(TEMPDIR)/unlimited
+TEMPDIR_LIMITED = $(TEMPDIR)/limited
build-policy: unlimited limited
@@ -270,21 +272,37 @@
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar: \
policy/unlimited/default_US_export.policy \
- policy/unlimited/UNLIMITED
+ $(TEMPDIR_UNLIMITED)/META-INF/MANIFEST.MF
$(prep-target)
- $(BOOT_JAR_CMD) cmf policy/unlimited/UNLIMITED $@ \
- -C policy/unlimited default_US_export.policy \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
+ $(CP) policy/unlimited/default_US_export.policy \
+ $(TEMPDIR_UNLIMITED)
+ $(TOUCH) -r $(TEMPDIR_UNLIMITED)/META-INF \
+ $(TEMPDIR_UNLIMITED)/default_US_export.policy
+ ( $(CD) $(TEMPDIR_UNLIMITED) && $(ZIPEXE) -Xr $@ META-INF \
+ default_US_export.policy )
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/local_policy.jar: \
policy/unlimited/default_local.policy \
+ $(TEMPDIR_UNLIMITED)/META-INF/MANIFEST.MF
+ $(prep-target)
+ $(CP) policy/unlimited/default_local.policy \
+ $(TEMPDIR_UNLIMITED)
+ $(TOUCH) -r $(TEMPDIR_UNLIMITED)/META-INF \
+ $(TEMPDIR_UNLIMITED)/default_local.policy
+ ( $(CD) $(TEMPDIR_UNLIMITED) && $(ZIPEXE) -Xr $@ META-INF \
+ default_local.policy )
+
+$(TEMPDIR_UNLIMITED)/META-INF/MANIFEST.MF: \
policy/unlimited/UNLIMITED
$(prep-target)
- $(BOOT_JAR_CMD) cmf policy/unlimited/UNLIMITED $@ \
- -C policy/unlimited default_local.policy \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
+ $(MKDIR) -p $(TEMPDIR_UNLIMITED)/META-INF
+ $(ECHO) "Manifest-Version: 1.0" > \
+ $(TEMPDIR_UNLIMITED)/META-INF/MANIFEST.MF
+ $(CAT) policy/unlimited/UNLIMITED >> \
+ $(TEMPDIR_UNLIMITED)/META-INF/MANIFEST.MF
+ $(TOUCH) -t 198001010000 $(TEMPDIR_UNLIMITED)/META-INF
+ $(TOUCH) -r $(TEMPDIR_UNLIMITED)/META-INF \
+ $(TEMPDIR_UNLIMITED)/META-INF/MANIFEST.MF
#
# Build the unsigned limited policy files.
@@ -303,13 +321,30 @@
$(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \
policy/limited/default_local.policy \
policy/limited/exempt_local.policy \
+ $(TEMPDIR_LIMITED)/META-INF/MANIFEST.MF
+ $(prep-target)
+ $(CP) policy/limited/default_local.policy \
+ $(TEMPDIR_LIMITED)
+ $(CP) policy/limited/exempt_local.policy \
+ $(TEMPDIR_LIMITED)
+ $(TOUCH) -r $(TEMPDIR_LIMITED)/META-INF \
+ $(TEMPDIR_LIMITED)/default_local.policy
+ $(TOUCH) -r $(TEMPDIR_LIMITED)/META-INF \
+ $(TEMPDIR_LIMITED)/exempt_local.policy
+ ( $(CD) $(TEMPDIR_UNLIMITED) && $(ZIPEXE) -Xr $@ META-INF \
+ default_local.policy exempt_local.policy )
+
+$(TEMPDIR_LIMITED)/META-INF/MANIFEST.MF: \
policy/limited/LIMITED
$(prep-target)
- $(BOOT_JAR_CMD) cmf policy/limited/LIMITED $@ \
- -C policy/limited default_local.policy \
- -C policy/limited exempt_local.policy \
- $(BOOT_JAR_JFLAGS)
- @$(java-vm-cleanup)
+ $(MKDIR) -p $(TEMPDIR_LIMITED)/META-INF
+ $(ECHO) "Manifest-Version: 1.0" > \
+ $(TEMPDIR_LIMITED)/META-INF/MANIFEST.MF
+ $(CAT) policy/limited/LIMITED >> \
+ $(TEMPDIR_LIMITED)/META-INF/MANIFEST.MF
+ $(TOUCH) -t 198001010000 $(TEMPDIR_LIMITED)/META-INF
+ $(TOUCH) -r $(TEMPDIR_LIMITED)/META-INF \
+ $(TEMPDIR_LIMITED)/META-INF/MANIFEST.MF
UNSIGNED_POLICY_FILES = \
$(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar \
diff -r eb70b48e4211 -r fa4e5dae68e1 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Wed Sep 03 15:34:29 2014 +0100
+++ b/make/jdk_generic_profile.sh Fri Sep 19 20:06:43 2014 +0100
@@ -245,11 +245,27 @@
PATH="${path4sdk}"
export PATH
+# Obtain pkgconfig for libs
+pkgconfig=$(which pkg-config 2>/dev/null)
+echo "pkgconfig=${pkgconfig}"
+
+# Find source location
+jdk_topdir=$(dirname ${BASH_SOURCE})/..
+if [ ! -e ${jdk_topdir}/src ] ; then
+ jdk_topdir=$(hg root) ;
+fi
+echo "jdk_topdir=${jdk_topdir}"
+
# Export variables required for Zero
+if [ "x${ZERO_BUILD}" = "x" ] ; then ZERO_BUILD=false; fi
+if [ "x${SHARK_BUILD}" = "x" ] ; then SHARK_BUILD=false; fi
if [ "${SHARK_BUILD}" = true ] ; then
ZERO_BUILD=true
export ZERO_BUILD
fi
+echo "Building Zero: ${ZERO_BUILD}"
+echo "Building Shark: ${SHARK_BUILD}"
+
if [ "${ZERO_BUILD}" = true ] ; then
# ZERO_LIBARCH is the name of the architecture-specific
# subdirectory under $JAVA_HOME/jre/lib
@@ -264,6 +280,7 @@
*) ZERO_LIBARCH="$(arch)"
esac
export ZERO_LIBARCH
+ echo "Zero library architecture: ${ZERO_LIBARCH}"
# ARCH_DATA_MODEL is the number of bits in a pointer
case "${ZERO_LIBARCH}" in
@@ -278,6 +295,7 @@
exit 1
esac
export ARCH_DATA_MODEL
+ echo "Zero architecture data model: ${ARCH_DATA_MODEL}"
# ZERO_ENDIANNESS is the endianness of the processor
case "${ZERO_LIBARCH}" in
@@ -292,6 +310,7 @@
exit 1
esac
export ZERO_ENDIANNESS
+ echo "Zero endianness: ${ZERO_ENDIANNESS}"
# ZERO_ARCHDEF is used to enable architecture-specific code
case "${ZERO_LIBARCH}" in
@@ -302,6 +321,7 @@
*) ZERO_ARCHDEF=$(echo "${ZERO_LIBARCH}" | tr a-z A-Z)
esac
export ZERO_ARCHDEF
+ echo "Zero architecture definition: ${ZERO_ARCHDEF}"
# ZERO_ARCHFLAG tells the compiler which mode to build for
case "${ZERO_LIBARCH}" in
@@ -315,10 +335,10 @@
ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
esac
export ZERO_ARCHFLAG
+ echo "Zero architecture flag: ${ZERO_ARCHFLAG}"
# LIBFFI_CFLAGS and LIBFFI_LIBS tell the compiler how to compile and
# link against libffi
- pkgconfig=$(which pkg-config 2>/dev/null)
if [ -x "${pkgconfig}" ] ; then
if [ "${LIBFFI_CFLAGS}" = "" ] ; then
LIBFFI_CFLAGS=$("${pkgconfig}" --cflags libffi)
@@ -328,11 +348,14 @@
fi
fi
if [ "${LIBFFI_LIBS}" = "" ] ; then
+ echo "No libffi detected.";
LIBFFI_LIBS="-lffi"
fi
export LIBFFI_CFLAGS
export LIBFFI_LIBS
-
+ echo "Using LIBFFI_CFLAGS=${LIBFFI_CFLAGS}"
+ echo "Using LIBFFI_LIBS=${LIBFFI_LIBS}"
+
# LLVM_CFLAGS, LLVM_LDFLAGS and LLVM_LIBS tell the compiler how to
# compile and link against LLVM
if [ "${SHARK_BUILD}" = true ] ; then
@@ -382,12 +405,12 @@
export LLVM_CFLAGS
export LLVM_LDFLAGS
export LLVM_LIBS
+ echo "Using LLVM_CFLAGS=${LLVM_CFLAGS}"
+ echo "Using LLVM_LDFLAGS=${LLVM_LDFLAGS}"
+ echo "Using LLVM_LIBS=${LLVM_LIBS}"
fi
fi
-# Obtain pkgconfig for libs
-pkgconfig=$(which pkg-config 2>/dev/null)
-
# Export variables for system zlib
# ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
# link against zlib
@@ -400,10 +423,13 @@
fi
fi
if [ "${ZLIB_LIBS}" = "" ] ; then
+ echo "No zlib detected.";
ZLIB_LIBS="-lz"
fi
export ZLIB_CFLAGS
export ZLIB_LIBS
+echo "Using ZLIB_CFLAGS=${ZLIB_CFLAGS}"
+echo "Using ZLIB_LIBS=${ZLIB_LIBS}"
# Export variables for system LCMS
# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
@@ -417,10 +443,13 @@
fi
fi
if [ "${LCMS_LIBS}" = "" ] ; then
+ echo "No LCMS detected.";
LCMS_LIBS="-llcms2"
fi
export LCMS_CFLAGS
export LCMS_LIBS
+echo "Using LCMS_CFLAGS=${LCMS_CFLAGS}"
+echo "Using LCMS_LIBS=${LCMS_LIBS}"
# Export variables for system jpeg
# JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
@@ -429,6 +458,7 @@
JPEG_LIBS="-ljpeg"
fi
export JPEG_LIBS
+echo "Using JPEG_LIBS=${JPEG_LIBS}"
# Export variables for system libpng
# PNG_CFLAGS and PNG_LIBS tell the compiler how to compile and
@@ -442,10 +472,13 @@
fi
fi
if [ "${PNG_LIBS}" = "" ] ; then
+ echo "No libpng detected.";
PNG_LIBS="-lpng"
fi
export PNG_CFLAGS
export PNG_LIBS
+echo "Using PNG_CFLAGS=${PNG_CFLAGS}"
+echo "Using PNG_LIBS=${PNG_LIBS}"
# Export variables for system giflib
# GIF_CFLAGS and GIF_LIBS tell the compiler how to compile and
@@ -454,6 +487,7 @@
GIF_LIBS="-lgif"
fi
export GIF_LIBS
+echo "Using GIF_LIBS=${GIF_LIBS}"
# Export variables for system krb5
# KRB5_CFLAGS and KRB5_LIBS tell the compiler how to compile and
@@ -462,6 +496,7 @@
KRB5_LIBS="-lkrb5"
fi
export KRB5_LIBS
+echo "Using KRB5_LIBS=${KRB5_LIBS}"
# Export variables for system CUPS
# CUPS_CFLAGS and CUPS_LIBS tell the compiler how to compile and
@@ -470,6 +505,7 @@
CUPS_LIBS="-lcups"
fi
export CUPS_LIBS
+echo "Using CUPS_LIBS=${CUPS_LIBS}"
# Export variables for system libgtk
# GTK_CFLAGS and GTK_LIBS tell the compiler how to compile and
@@ -484,6 +520,8 @@
fi
export GTK_CFLAGS
export GTK_LIBS
+echo "Using GTK_CFLAGS=${GTK_CFLAGS}"
+echo "Using GTK_LIBS=${GTK_LIBS}"
# Export variables for system libgio
# GIO_CFLAGS and GIO_LIBS tell the compiler how to compile and
@@ -500,6 +538,8 @@
fi
export GIO_CFLAGS
export GIO_LIBS
+echo "Using GIO_CFLAGS=${GIO_CFLAGS}"
+echo "Using GIO_LIBS=${GIO_LIBS}"
# Export variables for system libpcsc
# PCSC_CFLAGS and PCSC_LIBS tell the compiler how to compile and
@@ -515,10 +555,13 @@
fi
fi
if [ "${PCSC_LIBS}" = "" ] ; then
+ echo "No libpcsclite detected.";
PCSC_LIBS="-lpcsclite"
fi
export PCSC_CFLAGS
export PCSC_LIBS
+echo "Using PCSC_CFLAGS=${PCSC_CFLAGS}"
+echo "Using PCSC_LIBS=${PCSC_LIBS}"
# Export variables for system fontconfig
# FONTCONFIG_CFLAGS and FONTCONFIG_LIBS tell the compiler how to compile and
@@ -532,21 +575,28 @@
fi
fi
if [ "${FONTCONFIG_LIBS}" = "" ] ; then
+ echo "No fontconfig detected.";
FONTCONFIG_LIBS="-lfontconfig"
fi
export FONTCONFIG_CFLAGS
export FONTCONFIG_LIBS
+echo "Using FONTCONFIG_CFLAGS=${FONTCONFIG_CFLAGS}"
+echo "Using FONTCONFIG_LIBS=${FONTCONFIG_LIBS}"
# Setup nss.cfg using location of NSS libraries
if [ -x "${pkgconfig}" ] ; then
- jdk_topdir=$(dirname ${BASH_SOURCE})/..
- if [ ! -e ${jdk_topdir}/src ] ; then
- jdk_topdir=$(hg root) ;
+ if [ "${NSS_LIBDIR}" = "" ] ; then
+ NSS_LIBDIR=$("${pkgconfig}" --variable=libdir nss)
fi
- sed -e "s#@NSS_LIBDIR@#$(${pkgconfig} --variable=libdir nss)#" \
- ${jdk_topdir}/src/share/lib/security/nss.cfg.in \
- > ${jdk_topdir}/src/share/lib/security/nss.cfg
fi
+if [ "${NSS_LIBDIR}" = "" ] ; then
+ NSS_LIBDIR="/usr/lib";
+ echo "No NSS library directory detected.";
+fi
+echo "Using NSS_LIBDIR=${NSS_LIBDIR}"
+sed -e "s#@NSS_LIBDIR@#$()#" \
+ ${jdk_topdir}/src/share/lib/security/nss.cfg.in \
+ > ${jdk_topdir}/src/share/lib/security/nss.cfg
# IcedTea defaults; use system libraries
export SYSTEM_LCMS=true
@@ -561,10 +611,12 @@
export COMPILE_AGAINST_SYSCALLS=true
if [ "x${GTK_LIBS}" != "x" ] ; then
+ echo "Gtk+ detected; enabling system linking.";
export SYSTEM_GTK=true
fi
if [ "x${GIO_LIBS}" != "x" ] ; then
+ echo "GIO detected; enabling system linking.";
export SYSTEM_GIO=true
fi
@@ -573,23 +625,27 @@
# IcedTea versioning
export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.5.3pre00"
+export PACKAGE_VERSION="2.5.3pre01"
export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
+echo "Building ${DERIVATIVE_ID}"
if [ -e ${jdk_topdir} ] ; then
if hg -R ${jdk_topdir} id &>/dev/null ; then
export JDK_REVID="r$(hg -R ${jdk_topdir} id -i)";
+ echo "JDK Mercurial revision: ${JDK_REVID}"
fi
fi
hotspot_topdir=${jdk_topdir}/../hotspot
if [ -e ${hotspot_topdir} ] ; then
if hg -R ${hotspot_topdir} id &>/dev/null ; then
export HOTSPOT_BUILD_VERSION="r$(hg -R ${hotspot_topdir} id -i)";
+ echo "HotSpot Mercurial revision: ${HOTSPOT_BUILD_VERSION}"
fi
fi
lsbrelease=$(which lsb_release 2>/dev/null)
-if [ -x ${lsbrelease} ] ; then
+echo "lsbrelease=${lsbrelease}"
+if [ -x "${lsbrelease}" ] ; then
lsbinfo="$(${lsbrelease} -ds | sed 's/^"//;s/"$//')"
if test "x${PKGVERSION}" = "x"; then
export DISTRIBUTION_ID="Built on ${lsbinfo} ($(date))"
@@ -597,4 +653,6 @@
export DISTRIBUTION_ID="${lsbinfo}, package $PKGVERSION"
fi
export DISTRO_NAME="$(${lsbrelease} -is | sed 's/^"//;s/"$//')"
+ echo "Distribution ID: ${DISTRIBUTION_ID}"
+ echo "Distribution Name: ${DISTRO_NAME}"
fi
diff -r eb70b48e4211 -r fa4e5dae68e1 make/sun/gtk/Makefile
--- a/make/sun/gtk/Makefile Wed Sep 03 15:34:29 2014 +0100
+++ b/make/sun/gtk/Makefile Fri Sep 19 20:06:43 2014 +0100
@@ -58,6 +58,8 @@
ifeq ($(SYSTEM_GTK), true)
OTHER_LDLIBS += $(GTK_LIBS)
+else
+ OTHER_LDLIBS += $(LIBDL)
endif
ifeq ($(PLATFORM), solaris)
diff -r eb70b48e4211 -r fa4e5dae68e1 src/share/classes/com/sun/crypto/provider/AESCipher.java
--- a/src/share/classes/com/sun/crypto/provider/AESCipher.java Wed Sep 03 15:34:29 2014 +0100
+++ b/src/share/classes/com/sun/crypto/provider/AESCipher.java Fri Sep 19 20:06:43 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, 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
@@ -47,18 +47,122 @@
* @see OutputFeedback
*/
-public final class AESCipher extends CipherSpi {
+abstract class AESCipher extends CipherSpi {
+ public static final class General extends AESCipher {
+ public General() {
+ super(-1);
+ }
+ }
+ abstract static class OidImpl extends AESCipher {
+ protected OidImpl(int keySize, String mode, String padding) {
+ super(keySize);
+ try {
+ engineSetMode(mode);
+ engineSetPadding(padding);
+ } catch (GeneralSecurityException gse) {
+ // internal error; re-throw as provider exception
+ ProviderException pe =new ProviderException("Internal Error");
+ pe.initCause(gse);
+ throw pe;
+ }
+ }
+ }
+ public static final class AES128_ECB_NoPadding extends OidImpl {
+ public AES128_ECB_NoPadding() {
+ super(16, "ECB", "NOPADDING");
+ }
+ }
+ public static final class AES192_ECB_NoPadding extends OidImpl {
+ public AES192_ECB_NoPadding() {
+ super(24, "ECB", "NOPADDING");
+ }
+ }
+ public static final class AES256_ECB_NoPadding extends OidImpl {
+ public AES256_ECB_NoPadding() {
+ super(32, "ECB", "NOPADDING");
+ }
+ }
+ public static final class AES128_CBC_NoPadding extends OidImpl {
+ public AES128_CBC_NoPadding() {
+ super(16, "CBC", "NOPADDING");
+ }
+ }
+ public static final class AES192_CBC_NoPadding extends OidImpl {
+ public AES192_CBC_NoPadding() {
+ super(24, "CBC", "NOPADDING");
+ }
+ }
+ public static final class AES256_CBC_NoPadding extends OidImpl {
+ public AES256_CBC_NoPadding() {
+ super(32, "CBC", "NOPADDING");
+ }
+ }
+ public static final class AES128_OFB_NoPadding extends OidImpl {
+ public AES128_OFB_NoPadding() {
+ super(16, "OFB", "NOPADDING");
+ }
+ }
+ public static final class AES192_OFB_NoPadding extends OidImpl {
+ public AES192_OFB_NoPadding() {
+ super(24, "OFB", "NOPADDING");
+ }
+ }
+ public static final class AES256_OFB_NoPadding extends OidImpl {
+ public AES256_OFB_NoPadding() {
+ super(32, "OFB", "NOPADDING");
+ }
+ }
+ public static final class AES128_CFB_NoPadding extends OidImpl {
+ public AES128_CFB_NoPadding() {
+ super(16, "CFB", "NOPADDING");
+ }
+ }
+ public static final class AES192_CFB_NoPadding extends OidImpl {
+ public AES192_CFB_NoPadding() {
+ super(24, "CFB", "NOPADDING");
+ }
+ }
+ public static final class AES256_CFB_NoPadding extends OidImpl {
+ public AES256_CFB_NoPadding() {
+ super(32, "CFB", "NOPADDING");
+ }
+ }
More information about the distro-pkg-dev
mailing list