Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
d9b97433
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看板
提交
d9b97433
编写于
9月 29, 2010
作者:
W
weijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6988163: sun.security.util.Resources dup and a keytool doc typo
Reviewed-by: xuelei
上级
7751ed43
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
14 deletion
+5
-14
src/share/classes/sun/security/tools/KeyTool.java
src/share/classes/sun/security/tools/KeyTool.java
+1
-1
src/share/classes/sun/security/util/Resources.java
src/share/classes/sun/security/util/Resources.java
+4
-13
未找到文件。
src/share/classes/sun/security/tools/KeyTool.java
浏览文件 @
d9b97433
...
@@ -281,7 +281,7 @@ public final class KeyTool {
...
@@ -281,7 +281,7 @@ public final class KeyTool {
RFC
(
"rfc"
,
null
,
"output in RFC style"
),
RFC
(
"rfc"
,
null
,
"output in RFC style"
),
SIGALG
(
"sigalg"
,
"<sigalg>"
,
"signature algorithm name"
),
SIGALG
(
"sigalg"
,
"<sigalg>"
,
"signature algorithm name"
),
SRCALIAS
(
"srcalias"
,
"<srcalias>"
,
"source alias"
),
SRCALIAS
(
"srcalias"
,
"<srcalias>"
,
"source alias"
),
SRCKEYPASS
(
"srckeypass"
,
"<arg>"
,
"source key
store
password"
),
SRCKEYPASS
(
"srckeypass"
,
"<arg>"
,
"source key password"
),
SRCKEYSTORE
(
"srckeystore"
,
"<srckeystore>"
,
"source keystore name"
),
SRCKEYSTORE
(
"srckeystore"
,
"<srckeystore>"
,
"source keystore name"
),
SRCPROTECTED
(
"srcprotected"
,
null
,
"source keystore password protected"
),
SRCPROTECTED
(
"srcprotected"
,
null
,
"source keystore password protected"
),
SRCPROVIDERNAME
(
"srcprovidername"
,
"<srcprovidername>"
,
"source keystore provider name"
),
SRCPROVIDERNAME
(
"srcprovidername"
,
"<srcprovidername>"
,
"source keystore provider name"
),
...
...
src/share/classes/sun/security/util/Resources.java
浏览文件 @
d9b97433
...
@@ -116,11 +116,9 @@ public class Resources extends java.util.ListResourceBundle {
...
@@ -116,11 +116,9 @@ public class Resources extends java.util.ListResourceBundle {
{
"X.509 extension"
,
{
"X.509 extension"
,
"X.509 extension"
},
//-ext
"X.509 extension"
},
//-ext
{
"output file name"
,
{
"output file name"
,
"output file name"
},
//-file
"output file name"
},
//-file
and -outfile
{
"input file name"
,
{
"input file name"
,
"input file name"
},
//-file
"input file name"
},
//-file and -infile
{
"input file name"
,
"input file name"
},
//-infile
{
"key algorithm name"
,
{
"key algorithm name"
,
"key algorithm name"
},
//-keyalg
"key algorithm name"
},
//-keyalg
{
"key password"
,
{
"key password"
,
...
@@ -133,8 +131,6 @@ public class Resources extends java.util.ListResourceBundle {
...
@@ -133,8 +131,6 @@ public class Resources extends java.util.ListResourceBundle {
"new password"
},
//-new
"new password"
},
//-new
{
"do not prompt"
,
{
"do not prompt"
,
"do not prompt"
},
//-noprompt
"do not prompt"
},
//-noprompt
{
"output file name"
,
"output file name"
},
//-outfile
{
"password through protected mechanism"
,
{
"password through protected mechanism"
,
"password through protected mechanism"
},
//-protected
"password through protected mechanism"
},
//-protected
{
"provider argument"
,
{
"provider argument"
,
...
@@ -151,8 +147,8 @@ public class Resources extends java.util.ListResourceBundle {
...
@@ -151,8 +147,8 @@ public class Resources extends java.util.ListResourceBundle {
"signature algorithm name"
},
//-sigalg
"signature algorithm name"
},
//-sigalg
{
"source alias"
,
{
"source alias"
,
"source alias"
},
//-srcalias
"source alias"
},
//-srcalias
{
"source key
store
password"
,
{
"source key password"
,
"source key
store
password"
},
//-srckeypass
"source key password"
},
//-srckeypass
{
"source keystore name"
,
{
"source keystore name"
,
"source keystore name"
},
//-srckeystore
"source keystore name"
},
//-srckeystore
{
"source keystore password protected"
,
{
"source keystore password protected"
,
...
@@ -276,8 +272,6 @@ public class Resources extends java.util.ListResourceBundle {
...
@@ -276,8 +272,6 @@ public class Resources extends java.util.ListResourceBundle {
"Alias <{0}> has no certificate"
},
"Alias <{0}> has no certificate"
},
{
"Key pair not generated, alias <alias> already exists"
,
{
"Key pair not generated, alias <alias> already exists"
,
"Key pair not generated, alias <{0}> already exists"
},
"Key pair not generated, alias <{0}> already exists"
},
{
"Cannot derive signature algorithm"
,
"Cannot derive signature algorithm"
},
{
"Generating keysize bit keyAlgName key pair and self-signed certificate (sigAlgName) with a validity of validality days\n\tfor: x500Name"
,
{
"Generating keysize bit keyAlgName key pair and self-signed certificate (sigAlgName) with a validity of validality days\n\tfor: x500Name"
,
"Generating {0} bit {1} key pair and self-signed certificate ({2}) with a validity of {3} days\n\tfor: {4}"
},
"Generating {0} bit {1} key pair and self-signed certificate ({2}) with a validity of {3} days\n\tfor: {4}"
},
{
"Enter key password for <alias>"
,
"Enter key password for <{0}>"
},
{
"Enter key password for <alias>"
,
"Enter key password for <{0}>"
},
...
@@ -321,8 +315,6 @@ public class Resources extends java.util.ListResourceBundle {
...
@@ -321,8 +315,6 @@ public class Resources extends java.util.ListResourceBundle {
{
"Failed to parse input"
,
"Failed to parse input"
},
{
"Failed to parse input"
,
"Failed to parse input"
},
{
"Empty input"
,
"Empty input"
},
{
"Empty input"
,
"Empty input"
},
{
"Not X.509 certificate"
,
"Not X.509 certificate"
},
{
"Not X.509 certificate"
,
"Not X.509 certificate"
},
{
"Cannot derive signature algorithm"
,
"Cannot derive signature algorithm"
},
{
"alias has no public key"
,
"{0} has no public key"
},
{
"alias has no public key"
,
"{0} has no public key"
},
{
"alias has no X.509 certificate"
,
"{0} has no X.509 certificate"
},
{
"alias has no X.509 certificate"
,
"{0} has no X.509 certificate"
},
{
"New certificate (self-signed):"
,
"New certificate (self-signed):"
},
{
"New certificate (self-signed):"
,
"New certificate (self-signed):"
},
...
@@ -552,7 +544,6 @@ public class Resources extends java.util.ListResourceBundle {
...
@@ -552,7 +544,6 @@ public class Resources extends java.util.ListResourceBundle {
{
"package name"
,
"package name"
},
{
"package name"
,
"package name"
},
{
"policy type"
,
"policy type"
},
{
"policy type"
,
"policy type"
},
{
"property name"
,
"property name"
},
{
"property name"
,
"property name"
},
{
"provider name"
,
"provider name"
},
{
"Principal List"
,
"Principal List"
},
{
"Principal List"
,
"Principal List"
},
{
"Permission List"
,
"Permission List"
},
{
"Permission List"
,
"Permission List"
},
{
"Code Base"
,
"Code Base"
},
{
"Code Base"
,
"Code Base"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录