/hg/icedtea7-forest/jdk: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Sep 8 17:47:22 UTC 2014
changeset 223137954781 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=223137954781
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 e97e34bd3cc9 in /hg/icedtea7-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e97e34bd3cc9
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
diffstat:
make/jdk_generic_profile.sh | 82 ++++++++-
src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java | 21 ++-
2 files changed, 88 insertions(+), 15 deletions(-)
diffs (337 lines):
diff -r 9caf15ac18b8 -r e97e34bd3cc9 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh Wed Aug 27 23:07:42 2014 +0100
+++ b/make/jdk_generic_profile.sh Mon Sep 08 18:46:06 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
@@ -575,21 +627,25 @@
export ICEDTEA_NAME="IcedTea"
export PACKAGE_VERSION="2.6pre06"
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 9caf15ac18b8 -r e97e34bd3cc9 src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
--- a/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java Wed Aug 27 23:07:42 2014 +0100
+++ b/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java Mon Sep 08 18:46:06 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, 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
@@ -241,14 +241,29 @@
int off = secret.length >> 1;
int seclen = off + (secret.length & 1);
+ byte[] secKey = secret;
+ int keyLen = seclen;
byte[] output = new byte[outputLength];
// P_MD5(S1, label + seed)
- expand(md5, 16, secret, 0, seclen, labelBytes, seed, output,
+ // If we have a long secret, digest it first.
+ if (seclen > 64) { // 64: block size of HMAC-MD5
+ md5.update(secret, 0, seclen);
+ secKey = md5.digest();
+ keyLen = secKey.length;
+ }
+ expand(md5, 16, secKey, 0, keyLen, labelBytes, seed, output,
HMAC_ipad64.clone(), HMAC_opad64.clone());
// P_SHA-1(S2, label + seed)
- expand(sha, 20, secret, off, seclen, labelBytes, seed, output,
+ // If we have a long secret, digest it first.
+ if (seclen > 64) { // 64: block size of HMAC-SHA1
+ sha.update(secret, off, seclen);
+ secKey = sha.digest();
+ keyLen = secKey.length;
+ off = 0;
+ }
+ expand(sha, 20, secKey, off, keyLen, labelBytes, seed, output,
HMAC_ipad64.clone(), HMAC_opad64.clone());
return output;
More information about the distro-pkg-dev
mailing list