OpenJDK / jdk / jdk
changeset 59336:0b2e88024e7a
8245151: jarsigner should not raise duplicate warnings on verification
Reviewed-by: weijun
| author | hchao |
|---|---|
| date | Tue, 19 May 2020 11:55:44 +0800 |
| parents | ca1687338afe |
| children | 62d97ec739db |
| files | src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java test/jdk/sun/security/tools/jarsigner/TimestampCheck.java |
| diffstat | 3 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java Tue May 19 09:02:30 2020 +0900 +++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java Tue May 19 11:55:44 2020 +0800 @@ -1195,7 +1195,7 @@ if ((legacyAlg & 4) != 0) { warnings.add(String.format( - rb.getString("The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update."), + rb.getString("The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update."), legacyTsaDigestAlg)); }
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java Tue May 19 09:02:30 2020 +0900 +++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java Tue May 19 11:55:44 2020 +0800 @@ -282,6 +282,8 @@ "The %1$s algorithm specified for the %2$s option is considered a security risk. This algorithm will be disabled in a future update."}, {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.", "The %1$s algorithm specified for the %2$s option is considered a security risk and is disabled."}, + {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.", + "The %1$s timestamp digest algorithm is considered a security risk. This algorithm will be disabled in a future update."}, {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.", "The %1$s digest algorithm is considered a security risk. This algorithm will be disabled in a future update."}, {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
--- a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java Tue May 19 09:02:30 2020 +0900 +++ b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java Tue May 19 11:55:44 2020 +0800 @@ -445,7 +445,7 @@ verify("sha1tsaalg.jar", "-strict") .shouldHaveExitValue(0) .shouldContain("jar verified, with signer errors") - .shouldContain("SHA-1 digest algorithm is considered a security risk") + .shouldContain("SHA-1 timestamp digest algorithm is considered a security risk") .shouldNotContain("is disabled"); // Disabled algorithms