Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7147336: clarification on warning of keytool -printcrl
authorweijun
Tue, 21 Feb 2012 15:11:27 +0800
changeset 11912 49b066b32693
parent 11911 f960f3b33af3
child 11913 be61e1597cc6
7147336: clarification on warning of keytool -printcrl Reviewed-by: xuelei
jdk/src/share/classes/sun/security/tools/KeyTool.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/sun/security/util/Resources.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java	Tue Feb 21 08:51:26 2012 +0800
+++ b/jdk/src/share/classes/sun/security/tools/KeyTool.java	Tue Feb 21 15:11:27 2012 +0800
@@ -2117,19 +2117,24 @@
             if (caks != null) {
                 issuer = verifyCRL(caks, crl);
                 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) {
                 issuer = verifyCRL(keyStore, crl);
                 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) {
                 out.println(rb.getString
                         ("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
                         ("STARNN"));
             }
--- a/jdk/src/share/classes/sun/security/util/Resources.java	Tue Feb 21 08:51:26 2012 +0800
+++ b/jdk/src/share/classes/sun/security/util/Resources.java	Tue Feb 21 15:11:27 2012 +0800
@@ -409,6 +409,10 @@
         {"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: "},
         {".Empty.value.", "(Empty value)"},
         {"Extension.Request.", "Extension Request:"},
jdk-sandbox