提交 686329f4 编写于 作者: W weijun

7147336: clarification on warning of keytool -printcrl

Reviewed-by: xuelei
上级 905caeb2
...@@ -2117,19 +2117,24 @@ public final class KeyTool { ...@@ -2117,19 +2117,24 @@ public final class KeyTool {
if (caks != null) { if (caks != null) {
issuer = verifyCRL(caks, crl); issuer = verifyCRL(caks, crl);
if (issuer != null) { if (issuer != null) {
System.out.println("Verified by " + issuer + " in cacerts"); out.printf(rb.getString(
"verified.by.s.in.s"), issuer, "cacerts");
out.println();
} }
} }
if (issuer == null && keyStore != null) { if (issuer == null && keyStore != null) {
issuer = verifyCRL(keyStore, crl); issuer = verifyCRL(keyStore, crl);
if (issuer != null) { if (issuer != null) {
System.out.println("Verified by " + issuer + " in keystore"); out.printf(rb.getString(
"verified.by.s.in.s"), issuer, "keystore");
out.println();
} }
} }
if (issuer == null) { if (issuer == null) {
out.println(rb.getString out.println(rb.getString
("STAR")); ("STAR"));
out.println("WARNING: not verified. Make sure -keystore and -alias are correct."); out.println(rb.getString
("warning.not.verified.make.sure.keystore.is.correct"));
out.println(rb.getString out.println(rb.getString
("STARNN")); ("STARNN"));
} }
......
...@@ -409,6 +409,10 @@ public class Resources extends java.util.ListResourceBundle { ...@@ -409,6 +409,10 @@ public class Resources extends java.util.ListResourceBundle {
{"Please.provide.keysize.for.secret.key.generation", {"Please.provide.keysize.for.secret.key.generation",
"Please provide -keysize for secret key generation"}, "Please provide -keysize for secret key generation"},
{"verified.by.s.in.s", "Verified by %s in %s"},
{"warning.not.verified.make.sure.keystore.is.correct",
"WARNING: not verified. Make sure -keystore is correct."},
{"Extensions.", "Extensions: "}, {"Extensions.", "Extensions: "},
{".Empty.value.", "(Empty value)"}, {".Empty.value.", "(Empty value)"},
{"Extension.Request.", "Extension Request:"}, {"Extension.Request.", "Extension Request:"},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册