Mercurial > hg > openjdk > bsd-port > jdk

changeset 8782:f919f1243d0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7147336: clarification on warning of keytool -printcrl Reviewed-by: xuelei
author weijun
date Sat, 18 Nov 2017 22:05:16 +0000
parents 0134b20e49ba
children 9ffec539c75d
files src/share/classes/sun/security/tools/keytool/Main.java src/share/classes/sun/security/tools/keytool/Resources.java
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/tools/keytool/Main.java	Thu Nov 16 18:28:17 2017 +0000
+++ b/src/share/classes/sun/security/tools/keytool/Main.java	Sat Nov 18 22:05:16 2017 +0000
@@ -2121,19 +2121,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/src/share/classes/sun/security/tools/keytool/Resources.java	Thu Nov 16 18:28:17 2017 +0000
+++ b/src/share/classes/sun/security/tools/keytool/Resources.java	Sat Nov 18 22:05:16 2017 +0000
@@ -402,6 +402,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:"},