changeset 16611:0b5451e5361e

8152108: Correct jarsigner warning message about missing timestamp Reviewed-by: mullan
author weijun
date Wed, 01 Jun 2016 15:35:38 +0800
parents 1003b17156f3
children 23d88201b666
files src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java test/sun/security/tools/jarsigner/warnings/Test.java
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java	Tue May 31 22:04:00 2016 -0700
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java	Wed Jun 01 15:35:38 2016 +0800
@@ -247,9 +247,9 @@
         {"This.jar.contains.entries.whose.certificate.chain.is.not.validated.reason.1",
                  "This jar contains entries whose certificate chain is not validated. Reason: %s"},
         {"no.timestamp.signing",
-                "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
+                "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
         {"no.timestamp.verifying",
-                "This jar contains signatures that does not include a timestamp. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td) or after any future revocation date."},
+                "This jar contains signatures that does not include a timestamp. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
         {"Unknown.password.type.", "Unknown password type: "},
         {"Cannot.find.environment.variable.",
                 "Cannot find environment variable: "},
--- a/test/sun/security/tools/jarsigner/warnings/Test.java	Tue May 31 22:04:00 2016 -0700
+++ b/test/sun/security/tools/jarsigner/warnings/Test.java	Wed Jun 01 15:35:38 2016 +0800
@@ -118,13 +118,13 @@
             + "and this jar is not timestamped. "
             + "Without a timestamp, users may not be able to validate this jar "
             + "after the signer certificate's expiration date "
-            + "(%1$tY-%1$tm-%1$td) or after any future revocation date.";
+            + "(%1$tY-%1$tm-%1$td).";
 
     static final String NO_TIMESTAMP_VERIFYING_WARN_TEMPLATE
             = "This jar contains signatures that does not include a timestamp. "
             + "Without a timestamp, users may not be able to validate this jar "
             + "after the signer certificate's expiration date "
-            + "(%1$tY-%1$tm-%1$td) or after any future revocation date.";
+            + "(%1$tY-%1$tm-%1$td).";
 
     static final String NOT_YET_VALID_CERT_SIGNING_WARNING
             = "The signer certificate is not yet valid.";