Skip to content

8346285: Update jarsigner compatibility test for change in default digest algorithm #22765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mpdonova wants to merge 2 commits into from
Closed

8346285: Update jarsigner compatibility test for change in default digest algorithm #22765

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e08078
8346285: Update jarsigner compatibility test for change in default di…
mpdonova Dec 16, 2024
7d6bf2f
updated to use JarSigner.Builder.getDefaultDigestAlgorithm()
mpdonova Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -1439,7 +1442,11 @@ private SignItem tsaDigestAlgorithm(String tsaDigestAlgorithm) {
}

String expectedTsaDigestAlg() {
return tsaDigestAlgorithm != null ? tsaDigestAlgorithm : "SHA-256";
Copy link
Contributor

@wangweij wangweij Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can actually get it from jdk.security.jarsigner.JarSigner.Builder.getDefaultDigestAlgorithm().

Copy link
Contributor Author

@mpdonova mpdonova Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the code to use getDefaultDigestAlgorithm but I still need the version-check because this test invokes jarsigner in different JDKs that use different default algorithms.

return tsaDigestAlgorithm != null
? tsaDigestAlgorithm
: jdkInfo.majorVersion >= 20
? JarSigner.Builder.getDefaultDigestAlgorithm()
: "SHA-256";
}

private SignItem tsaIndex(int tsaIndex) {
Expand Down