From 6e080784a416e163a6de95c79a9186e44c0c5f24 Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Mon, 16 Dec 2024 09:56:02 -0500 Subject: [PATCH 1/2] 8346285: Update jarsigner compatibility test for change in default digest algorithm --- .../tools/jarsigner/compatibility/Compatibility.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java index 7fab7d828aee0..64eab2e2d0b15 100644 --- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java +++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1439,7 +1439,9 @@ private SignItem tsaDigestAlgorithm(String tsaDigestAlgorithm) { } String expectedTsaDigestAlg() { - return tsaDigestAlgorithm != null ? tsaDigestAlgorithm : "SHA-256"; + return tsaDigestAlgorithm != null + ? tsaDigestAlgorithm + : jdkInfo.majorVersion < 19 ? "SHA-256" : "SHA-384"; } private SignItem tsaIndex(int tsaIndex) { From 7d6bf2fe55ab458c12d97346f669cf10e6373f22 Mon Sep 17 00:00:00 2001 From: Matthew Donovan Date: Mon, 16 Dec 2024 10:23:25 -0500 Subject: [PATCH 2/2] updated to use JarSigner.Builder.getDefaultDigestAlgorithm() --- .../tools/jarsigner/compatibility/Compatibility.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java index 64eab2e2d0b15..9b84f548c703d 100644 --- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java +++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java @@ -67,6 +67,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import jdk.security.jarsigner.JarSigner; import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.ProcessTools; import jdk.test.lib.util.JarUtils; @@ -1430,7 +1431,9 @@ private SignItem digestAlgorithm(String digestAlgorithm) { String expectedDigestAlg() { return digestAlgorithm != null ? digestAlgorithm - : jdkInfo.majorVersion >= 20 ? "SHA-384" : "SHA-256"; + : jdkInfo.majorVersion >= 20 + ? JarSigner.Builder.getDefaultDigestAlgorithm() + : "SHA-256"; } private SignItem tsaDigestAlgorithm(String tsaDigestAlgorithm) { @@ -1441,7 +1444,9 @@ private SignItem tsaDigestAlgorithm(String tsaDigestAlgorithm) { String expectedTsaDigestAlg() { return tsaDigestAlgorithm != null ? tsaDigestAlgorithm - : jdkInfo.majorVersion < 19 ? "SHA-256" : "SHA-384"; + : jdkInfo.majorVersion >= 20 + ? JarSigner.Builder.getDefaultDigestAlgorithm() + : "SHA-256"; } private SignItem tsaIndex(int tsaIndex) {