提交 9608a60f 编写于 作者: L lana

Merge

...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
# @test # @test
# @bug 7106773 # @bug 7106773
# @summary 512 bits RSA key cannot work with SHA384 and SHA512 # @summary 512 bits RSA key cannot work with SHA384 and SHA512
# @run shell ShortRSAKey1024.sh # @run shell ShortRSAKey1024.sh 1024
# @run shell ShortRSAKey1024.sh 768
# @run shell ShortRSAKey1024.sh 512
# set a few environment variables so that the shell-script can run stand-alone # set a few environment variables so that the shell-script can run stand-alone
# in the source directory # in the source directory
...@@ -55,6 +57,8 @@ case "$OS" in ...@@ -55,6 +57,8 @@ case "$OS" in
;; ;;
esac esac
BITS=$1
case "$OS" in case "$OS" in
Windows* | CYGWIN* ) Windows* | CYGWIN* )
...@@ -63,9 +67,10 @@ case "$OS" in ...@@ -63,9 +67,10 @@ case "$OS" in
-genkeypair \ -genkeypair \
-storetype Windows-My \ -storetype Windows-My \
-keyalg RSA \ -keyalg RSA \
-alias 7106773.1024 \ -alias 7106773.$BITS \
-keysize 1024 \ -keysize $BITS \
-dname "cn=localhost,c=US" \ -dname "cn=localhost,c=US" \
-debug \
-noprompt -noprompt
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
...@@ -77,7 +82,7 @@ case "$OS" in ...@@ -77,7 +82,7 @@ case "$OS" in
echo "Running the test..." echo "Running the test..."
${TESTJAVA}${FS}bin${FS}javac -d . \ ${TESTJAVA}${FS}bin${FS}javac -d . \
${TESTSRC}${FS}ShortRSAKeyWithinTLS.java ${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
${TESTJAVA}${FS}bin${FS}java ShortRSAKeyWithinTLS 7106773.1024 1024 \ ${TESTJAVA}${FS}bin${FS}java ShortRSAKeyWithinTLS 7106773.$BITS $BITS \
TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
rc=$? rc=$?
...@@ -87,7 +92,8 @@ case "$OS" in ...@@ -87,7 +92,8 @@ case "$OS" in
${TESTJAVA}${FS}bin${FS}keytool \ ${TESTJAVA}${FS}bin${FS}keytool \
-delete \ -delete \
-storetype Windows-My \ -storetype Windows-My \
-alias 7106773.1024 -debug \
-alias 7106773.$BITS
echo "Done". echo "Done".
exit $rc exit $rc
......
#!/bin/sh
#
# Copyright (c) 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
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.
#
# This code 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 General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, 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.
#
# @test
# @bug 7106773
# @summary 512 bits RSA key cannot work with SHA384 and SHA512
# @run shell ShortRSAKey512.sh
# set a few environment variables so that the shell-script can run stand-alone
# in the source directory
if [ "${TESTSRC}" = "" ] ; then
TESTSRC="."
fi
if [ "${TESTCLASSES}" = "" ] ; then
TESTCLASSES="."
fi
if [ "${TESTJAVA}" = "" ] ; then
echo "TESTJAVA not set. Test cannot execute."
echo "FAILED!!!"
exit 1
fi
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows_* )
FS="\\"
;;
esac
case "$OS" in
Windows* | CYGWIN* )
echo "Creating a temporary RSA keypair in the Windows-My store..."
${TESTJAVA}${FS}bin${FS}keytool \
-genkeypair \
-storetype Windows-My \
-keyalg RSA \
-alias 7106773.512 \
-keysize 512 \
-dname "cn=localhost,c=US" \
-noprompt
if [ "$?" -ne "0" ]; then
echo "Unable to generate key pair in Windows-My keystore"
exit 1
fi
echo
echo "Running the test..."
${TESTJAVA}${FS}bin${FS}javac -d . \
${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
${TESTJAVA}${FS}bin${FS}java ShortRSAKeyWithinTLS 7106773.512 512 \
TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
rc=$?
echo
echo "Removing the temporary RSA keypair from the Windows-My store..."
${TESTJAVA}${FS}bin${FS}keytool \
-delete \
-storetype Windows-My \
-alias 7106773.512
echo "Done".
exit $rc
;;
* )
echo "This test is not intended for '$OS' - passing test"
exit 0
;;
esac
#!/bin/sh
#
# Copyright (c) 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
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.
#
# This code 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 General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, 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.
#
# @test
# @bug 7106773
# @summary 512 bits RSA key cannot work with SHA384 and SHA512
# @run shell ShortRSAKey768.sh
# set a few environment variables so that the shell-script can run stand-alone
# in the source directory
if [ "${TESTSRC}" = "" ] ; then
TESTSRC="."
fi
if [ "${TESTCLASSES}" = "" ] ; then
TESTCLASSES="."
fi
if [ "${TESTJAVA}" = "" ] ; then
echo "TESTJAVA not set. Test cannot execute."
echo "FAILED!!!"
exit 1
fi
OS=`uname -s`
case "$OS" in
SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows_* )
FS="\\"
;;
esac
case "$OS" in
Windows* | CYGWIN* )
echo "Creating a temporary RSA keypair in the Windows-My store..."
${TESTJAVA}${FS}bin${FS}keytool \
-genkeypair \
-storetype Windows-My \
-keyalg RSA \
-alias 7106773.768 \
-keysize 768 \
-dname "cn=localhost,c=US" \
-noprompt
if [ "$?" -ne "0" ]; then
echo "Unable to generate key pair in Windows-My keystore"
exit 1
fi
echo
echo "Running the test..."
${TESTJAVA}${FS}bin${FS}javac -d . \
${TESTSRC}${FS}ShortRSAKeyWithinTLS.java
${TESTJAVA}${FS}bin${FS}java ShortRSAKeyWithinTLS 7106773.768 768 \
TLSv1.2 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
rc=$?
echo
echo "Removing the temporary RSA keypair from the Windows-My store..."
${TESTJAVA}${FS}bin${FS}keytool \
-delete \
-storetype Windows-My \
-alias 7106773.768
echo "Done".
exit $rc
;;
* )
echo "This test is not intended for '$OS' - passing test"
exit 0
;;
esac
...@@ -71,7 +71,7 @@ case "$OS" in ...@@ -71,7 +71,7 @@ case "$OS" in
i[3-6]86 ) i[3-6]86 )
PF="linux-i586" PF="linux-i586"
;; ;;
amd64* ) amd64* | x86_64 )
PF="linux-amd64" PF="linux-amd64"
;; ;;
* ) * )
...@@ -97,15 +97,29 @@ case "$OS" in ...@@ -97,15 +97,29 @@ case "$OS" in
;; ;;
esac esac
echo "==================================================="
echo "Try to set ALT_JAVA_RE_JDK if you see timeout error"
echo "==================================================="
# the test code # the test code
${TESTJAVA}${FS}bin${FS}javac -target 1.4 -source 1.4 \ ${TESTJAVA}${FS}bin${FS}javac -target 1.4 -source 1.4 \
-d . ${TESTSRC}${FS}SerialTest.java || exit 10 -d . ${TESTSRC}${FS}SerialTest.java || exit 10
# You can set ALT_JAVA_RE_JDK to another location that contains the
# binaries for older JDK releases. You can set it to a non-existent
# directory to skip the interop tests between different versions.
if [ "$ALT_JAVA_RE_JDK" = "" ]; then
JAVA_RE_JDK=/java/re/j2se
else
JAVA_RE_JDK=$ALT_JAVA_RE_JDK
fi
OLDJAVA=" OLDJAVA="
/java/re/j2se/1.6.0/latest/binaries/${PF} $JAVA_RE_JDK/1.6.0/latest/binaries/${PF}
/java/re/j2se/1.5.0/latest/binaries/${PF} $JAVA_RE_JDK/1.5.0/latest/binaries/${PF}
/java/re/j2se/1.4.2/latest/binaries/${PF} $JAVA_RE_JDK/1.4.2/latest/binaries/${PF}
" "
SMALL=" SMALL="
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册