8152108: Correct jarsigner warning message about missing timestamp
Reviewed-by: mullan
--- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java Tue May 31 22:04:00 2016 -0700
+++ b/jdk/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/jdk/test/sun/security/tools/jarsigner/warnings/Test.java Tue May 31 22:04:00 2016 -0700
+++ b/jdk/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.";