Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
61681b39
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
61681b39
编写于
10月 23, 2013
作者:
W
weijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8027026: Change keytool -genkeypair to use -keyalg RSA
Reviewed-by: alanb, chegar, mullan
上级
75b69326
变更
26
隐藏空白更改
内联
并排
Showing
26 changed file
with
27 addition
and
34 deletion
+27
-34
test/ProblemList.txt
test/ProblemList.txt
+1
-10
test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh
test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh
+1
-0
test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java
test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java
+1
-1
test/sun/security/pkcs12/PKCS12SameKeyId.java
test/sun/security/pkcs12/PKCS12SameKeyId.java
+1
-1
test/sun/security/tools/jarsigner/TimestampCheck.java
test/sun/security/tools/jarsigner/TimestampCheck.java
+1
-1
test/sun/security/tools/jarsigner/checkusage.sh
test/sun/security/tools/jarsigner/checkusage.sh
+1
-1
test/sun/security/tools/jarsigner/collator.sh
test/sun/security/tools/jarsigner/collator.sh
+1
-1
test/sun/security/tools/jarsigner/crl.sh
test/sun/security/tools/jarsigner/crl.sh
+1
-1
test/sun/security/tools/jarsigner/jvindex.sh
test/sun/security/tools/jarsigner/jvindex.sh
+1
-1
test/sun/security/tools/jarsigner/newsize7.sh
test/sun/security/tools/jarsigner/newsize7.sh
+1
-1
test/sun/security/tools/jarsigner/onlymanifest.sh
test/sun/security/tools/jarsigner/onlymanifest.sh
+1
-1
test/sun/security/tools/jarsigner/passtype.sh
test/sun/security/tools/jarsigner/passtype.sh
+1
-1
test/sun/security/tools/jarsigner/samename.sh
test/sun/security/tools/jarsigner/samename.sh
+1
-1
test/sun/security/tools/jarsigner/ts.sh
test/sun/security/tools/jarsigner/ts.sh
+1
-1
test/sun/security/tools/keytool/CloseFile.java
test/sun/security/tools/keytool/CloseFile.java
+1
-1
test/sun/security/tools/keytool/ListKeychainStore.sh
test/sun/security/tools/keytool/ListKeychainStore.sh
+1
-0
test/sun/security/tools/keytool/StartDateTest.java
test/sun/security/tools/keytool/StartDateTest.java
+1
-1
test/sun/security/tools/keytool/UnknownAndUnparseable.java
test/sun/security/tools/keytool/UnknownAndUnparseable.java
+1
-1
test/sun/security/tools/keytool/emptysubject.sh
test/sun/security/tools/keytool/emptysubject.sh
+1
-1
test/sun/security/tools/keytool/importreadall.sh
test/sun/security/tools/keytool/importreadall.sh
+1
-1
test/sun/security/tools/keytool/p12importks.sh
test/sun/security/tools/keytool/p12importks.sh
+2
-2
test/sun/security/tools/keytool/readjar.sh
test/sun/security/tools/keytool/readjar.sh
+1
-1
test/sun/security/tools/keytool/selfissued.sh
test/sun/security/tools/keytool/selfissued.sh
+1
-1
test/sun/security/tools/keytool/trystore.sh
test/sun/security/tools/keytool/trystore.sh
+1
-1
test/sun/security/validator/certreplace.sh
test/sun/security/validator/certreplace.sh
+1
-1
test/sun/security/validator/samedn.sh
test/sun/security/validator/samedn.sh
+1
-1
未找到文件。
test/ProblemList.txt
浏览文件 @
61681b39
...
...
@@ -273,14 +273,8 @@ sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java solaris-all
sun/security/pkcs11/Secmod/AddPrivateKey.java linux-all
sun/security/pkcs11/Secmod/TrustAnchors.java linux-all
# 7041639, Solaris DSA keypair generation bug
(Note: jdk_util also affected)
# 7041639, Solaris DSA keypair generation bug
java/security/KeyPairGenerator/SolarisShortDSA.java solaris-all
sun/security/tools/jarsigner/onlymanifest.sh solaris-all
sun/security/tools/jarsigner/ts.sh solaris-all
sun/security/tools/keytool/emptysubject.sh solaris-all
sun/security/tools/keytool/importreadall.sh solaris-all
sun/security/tools/keytool/readjar.sh solaris-all
sun/security/tools/keytool/selfissued.sh solaris-all
sun/security/tools/keytool/standard.sh solaris-all
# 8000439: NPG: REGRESSION : sun/security/krb5/auto/MaxRetries.java fails with timeout
...
...
@@ -351,7 +345,4 @@ java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java generic-all
# Filed 6772009
java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all
# 7041639, Solaris DSA keypair generation bug
java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all
############################################################################
test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh
浏览文件 @
61681b39
...
...
@@ -40,6 +40,7 @@ rm -f ${TESTCLASSES}/timezonedatetest.store
${
COMPILEJAVA
}
/bin/keytool
${
TESTTOOLVMOPTS
}
-genkeypair
-alias
testcert
\
-keystore
${
TESTCLASSES
}
/timezonedatetest.store
\
-storepass
testpass
-validity
360
\
-keyalg
rsa
\
-dname
"cn=Mark Wildebeest, ou=FreeSoft, o=Red Hat, c=NL"
\
-keypass
testpass
...
...
test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java
浏览文件 @
61681b39
...
...
@@ -49,7 +49,7 @@ public class ExtraFileInMetaInf {
new
File
(
"ks"
).
delete
();
sun
.
security
.
tools
.
keytool
.
Main
.
main
(
(
"-keystore ks -storepass changeit -keypass changeit "
+
"-alias a -dname CN=A -genkeypair"
).
split
(
" "
));
"-
keyalg rsa -
alias a -dname CN=A -genkeypair"
).
split
(
" "
));
sun
.
security
.
tools
.
jarsigner
.
Main
.
main
(
"-keystore ks -storepass changeit x.jar a"
.
split
(
" "
));
...
...
test/sun/security/pkcs12/PKCS12SameKeyId.java
浏览文件 @
61681b39
...
...
@@ -60,7 +60,7 @@ public class PKCS12SameKeyId {
for
(
int
i
=
0
;
i
<
SIZE
;
i
++)
{
System
.
err
.
print
(
"."
);
String
cmd
=
"-keystore "
+
JKSFILE
+
" -storepass changeit -keypass changeit "
+
" -storepass changeit -keypass changeit
-keyalg rsa
"
+
"-genkeypair -alias p"
+
i
+
" -dname CN="
+
i
;
sun
.
security
.
tools
.
keytool
.
Main
.
main
(
cmd
.
split
(
" "
));
}
...
...
test/sun/security/tools/jarsigner/TimestampCheck.java
浏览文件 @
61681b39
...
...
@@ -185,7 +185,7 @@ public class TimestampCheck {
DerOutputStream
tstInfo2
=
new
DerOutputStream
();
tstInfo2
.
putOctetString
(
tstInfo
.
toByteArray
());
Signature
sig
=
Signature
.
getInstance
(
"SHA1with
D
SA"
);
Signature
sig
=
Signature
.
getInstance
(
"SHA1with
R
SA"
);
sig
.
initSign
((
PrivateKey
)(
ks
.
getKey
(
alias
,
"changeit"
.
toCharArray
())));
sig
.
update
(
tstInfo
.
toByteArray
());
...
...
test/sun/security/tools/jarsigner/checkusage.sh
浏览文件 @
61681b39
...
...
@@ -45,7 +45,7 @@ case "$OS" in
;;
esac
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit"
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit
-keyalg rsa
"
JAR
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jar
JARSIGNER
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
jarsigner"
...
...
test/sun/security/tools/jarsigner/collator.sh
浏览文件 @
61681b39
...
...
@@ -47,7 +47,7 @@ KS=collator.jks
JFILE
=
collator.jar
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit
\
-keystore
$KS
"
-key
alg rsa -key
store
$KS
"
JAR
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jar
JARSIGNER
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
jarsigner -keystore
$KS
-storepass changeit"
...
...
test/sun/security/tools/jarsigner/crl.sh
浏览文件 @
61681b39
...
...
@@ -45,7 +45,7 @@ esac
KS
=
crl.jks
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
"
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
-keyalg rsa
"
rm
$KS
2> /dev/null
...
...
test/sun/security/tools/jarsigner/jvindex.sh
浏览文件 @
61681b39
...
...
@@ -47,7 +47,7 @@ KS=jvindex.jks
JFILE
=
jvindex.jar
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit
\
-keystore
$KS
"
-keystore
$KS
-keyalg rsa
"
JAR
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jar
JARSIGNER
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
jarsigner -keystore
$KS
-storepass changeit"
...
...
test/sun/security/tools/jarsigner/newsize7.sh
浏览文件 @
61681b39
...
...
@@ -51,7 +51,7 @@ esac
KSFILE
=
ns7.jks
KT
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -keystore ns7.jks -storepass changeit -keypass changeit"
KT
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -keystore ns7.jks -storepass changeit -keypass changeit
-keyalg rsa
"
JAR
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
jar"
JS
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
jarsigner -keystore ns7.jks -storepass changeit"
...
...
test/sun/security/tools/jarsigner/onlymanifest.sh
浏览文件 @
61681b39
...
...
@@ -46,7 +46,7 @@ KS=onlymanifest.jks
JFILE
=
onlymanifest.jar
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit
\
-keystore
$KS
"
-keystore
$KS
-keyalg rsa
"
JAR
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jar
JARSIGNER
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jarsigner
...
...
test/sun/security/tools/jarsigner/passtype.sh
浏览文件 @
61681b39
...
...
@@ -45,7 +45,7 @@ esac
KS
=
pt.jks
JFILE
=
pt.jar
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -keystore
$KS
-validity 300"
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -keystore
$KS
-validity 300
-keyalg rsa
"
JAR
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jar
JARSIGNER
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jarsigner
...
...
test/sun/security/tools/jarsigner/samename.sh
浏览文件 @
61681b39
...
...
@@ -47,7 +47,7 @@ esac
KS
=
samename.jks
JFILE
=
em.jar
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
"
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
-keyalg rsa
"
JAR
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jar
JARSIGNER
=
$TESTJAVA
${
FS
}
bin
${
FS
}
jarsigner
...
...
test/sun/security/tools/jarsigner/ts.sh
浏览文件 @
61681b39
...
...
@@ -53,7 +53,7 @@ fi
JAR
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
jar"
JAVA
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
java"
JAVAC
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
javac"
KT
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -keystore tsks -storepass changeit -keypass changeit"
KT
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -keystore tsks -storepass changeit -keypass changeit
-keyalg rsa
"
rm
tsks
echo
Nothing
>
A
...
...
test/sun/security/tools/keytool/CloseFile.java
浏览文件 @
61681b39
...
...
@@ -59,7 +59,7 @@ public class CloseFile {
}
static
void
run
(
String
s
)
throws
Exception
{
sun
.
security
.
tools
.
keytool
.
Main
.
main
((
s
+
" -debug"
).
split
(
" "
));
sun
.
security
.
tools
.
keytool
.
Main
.
main
((
s
+
" -debug
-keyalg rsa
"
).
split
(
" "
));
}
static
void
remove
(
String
filename
,
boolean
check
)
{
new
File
(
filename
).
delete
();
...
...
test/sun/security/tools/keytool/ListKeychainStore.sh
浏览文件 @
61681b39
...
...
@@ -71,6 +71,7 @@ do
-storetype
PKCS12
\
-keystore
$TEMPORARY_P12
\
-storepass
$PWD
\
-keyalg
rsa
\
-dname
"CN=
$i
,OU=
$i
,O=
$i
,ST=
$i
,C=US"
\
-alias
7133495-
$i
...
...
test/sun/security/tools/keytool/StartDateTest.java
浏览文件 @
61681b39
...
...
@@ -49,7 +49,7 @@ public class StartDateTest {
new
File
(
"jks"
).
delete
();
run
(
"-keystore jks -storetype jks -storepass changeit -keypass changeit -alias me "
+
"-genkeypair -dname CN=Haha -startdate +1y"
);
"-
keyalg rsa -
genkeypair -dname CN=Haha -startdate +1y"
);
cal
.
setTime
(
getIssueDate
());
System
.
out
.
println
(
cal
);
if
(
cal
.
get
(
Calendar
.
YEAR
)
!=
year
+
1
)
{
...
...
test/sun/security/tools/keytool/UnknownAndUnparseable.java
浏览文件 @
61681b39
...
...
@@ -43,7 +43,7 @@ public class UnknownAndUnparseable {
// Create a cert with an unknown extension: 1.2.3.4, and an invalid
// KeyUsage extension
String
genkey
=
s
+
"-genkeypair -alias a -dname CN=A -ext 1.2.3.4=1234 "
+
"-genkeypair -alias a -dname CN=A -ext 1.2.3.4=1234
-keyalg rsa
"
+
"-ext "
+
PKIXExtensions
.
KeyUsage_Id
.
toString
()
+
"=5678"
;
sun
.
security
.
tools
.
keytool
.
Main
.
main
(
genkey
.
split
(
" "
));
...
...
test/sun/security/tools/keytool/emptysubject.sh
浏览文件 @
61681b39
...
...
@@ -45,7 +45,7 @@ case "$OS" in
esac
KS
=
emptysubject.jks
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
"
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
-keyalg rsa
"
rm
$KS
...
...
test/sun/security/tools/keytool/importreadall.sh
浏览文件 @
61681b39
...
...
@@ -49,7 +49,7 @@ case "$OS" in
;;
esac
KEYTOOL
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -keystore importreadall.jks -storepass changeit -keypass changeit"
KEYTOOL
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -keystore importreadall.jks -storepass changeit -keypass changeit
-keyalg rsa
"
# In case the test is run twice in the same directory
...
...
test/sun/security/tools/keytool/p12importks.sh
浏览文件 @
61681b39
...
...
@@ -50,7 +50,7 @@ KT=$TESTJAVA${FS}bin${FS}keytool
rm
jks 2> /dev/null
$KT
-genkeypair
-keystore
jks
-storetype
jks
-alias
me
-dname
CN
=
Me
\
-storepass
pass1111
-keypass
pass1111
||
exit
11
-
keyalg
rsa
-
storepass
pass1111
-keypass
pass1111
||
exit
11
# Cannot only change storepass
rm
p12 2> /dev/null
...
...
@@ -85,7 +85,7 @@ $KT -certreq -storetype pkcs12 -keystore p12 -alias me \
rm
jks 2> /dev/null
$KT
-genkeypair
-keystore
jks
-storetype
jks
-alias
me
-dname
CN
=
Me
\
-storepass
pass1111
-keypass
pass2222
||
exit
21
-
keyalg
rsa
-
storepass
pass1111
-keypass
pass2222
||
exit
21
# Can use old keypass as new storepass so new storepass and keypass are same
rm
p12 2> /dev/null
...
...
test/sun/security/tools/keytool/readjar.sh
浏览文件 @
61681b39
...
...
@@ -46,7 +46,7 @@ esac
KS
=
readjar.jks
rm
$KS
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool
${
TESTTOOLVMOPTS
}
-storepass
changeit
-keypass
changeit
-keystore
$KS
\
-alias
x
-dname
CN
=
X
-genkeypair
-
keyalg
rsa
-
alias
x
-dname
CN
=
X
-genkeypair
$COMPILEJAVA
${
FS
}
bin
${
FS
}
jar
${
TESTTOOLVMOPTS
}
cvf readjar.jar
$KS
$COMPILEJAVA
${
FS
}
bin
${
FS
}
jarsigner
${
TESTTOOLVMOPTS
}
-storepass
changeit
-keystore
$KS
readjar.jar x
...
...
test/sun/security/tools/keytool/selfissued.sh
浏览文件 @
61681b39
...
...
@@ -45,7 +45,7 @@ case "$OS" in
esac
KS
=
selfsigned.jks
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
"
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit -keypass changeit -keystore
$KS
-keyalg rsa
"
rm
$KS
...
...
test/sun/security/tools/keytool/trystore.sh
浏览文件 @
61681b39
...
...
@@ -43,7 +43,7 @@ esac
rm
trystore.jks 2> /dev/null
KEYTOOL
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -storetype jks -keystore trystore.jks"
KEYTOOL
=
"
${
TESTJAVA
}${
FS
}
bin
${
FS
}
keytool -storetype jks -keystore trystore.jks
-keyalg rsa
"
$KEYTOOL
-genkeypair
-alias
a
-dname
CN
=
A
-storepass
changeit
-keypass
changeit
$KEYTOOL
-genkeypair
-alias
b
-dname
CN
=
B
-storepass
changeit
-keypass
changeit
...
...
test/sun/security/validator/certreplace.sh
浏览文件 @
61681b39
...
...
@@ -48,7 +48,7 @@ case "$OS" in
esac
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit
\
-keypass changeit -keystore certreplace.jks"
-keypass changeit -keystore certreplace.jks
-keyalg rsa
"
JAVAC
=
$COMPILEJAVA
${
FS
}
bin
${
FS
}
javac
JAVA
=
$TESTJAVA
${
FS
}
bin
${
FS
}
java
...
...
test/sun/security/validator/samedn.sh
浏览文件 @
61681b39
...
...
@@ -48,7 +48,7 @@ case "$OS" in
esac
KT
=
"
$TESTJAVA
${
FS
}
bin
${
FS
}
keytool -storepass changeit
\
-keypass changeit -keystore samedn.jks"
-keypass changeit -keystore samedn.jks
-keyalg rsa
"
JAVAC
=
$COMPILEJAVA
${
FS
}
bin
${
FS
}
javac
JAVA
=
$TESTJAVA
${
FS
}
bin
${
FS
}
java
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录