From fdda861164d8edd0744e09c4afb06eece2e63f07 Mon Sep 17 00:00:00 2001 From: Stephan Classen Date: Tue, 5 Dec 2023 15:34:20 +0100 Subject: [PATCH] use reflection to call method with changed signature in Java 21 --- .../sourceforge/jnlp/tools/JarCertVerifier.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/net/sourceforge/jnlp/tools/JarCertVerifier.java b/core/src/main/java/net/sourceforge/jnlp/tools/JarCertVerifier.java index e387bc715..3a3162ec3 100644 --- a/core/src/main/java/net/sourceforge/jnlp/tools/JarCertVerifier.java +++ b/core/src/main/java/net/sourceforge/jnlp/tools/JarCertVerifier.java @@ -44,6 +44,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Method; import java.security.CodeSigner; import java.security.KeyStore; import java.security.Timestamp; @@ -64,6 +65,7 @@ import java.util.regex.Pattern; import java.util.zip.ZipException; +import static java.lang.Boolean.TRUE; import static java.time.temporal.ChronoUnit.MONTHS; /** @@ -609,7 +611,7 @@ private void checkCertUsage(final CertPath certPath, final X509Certificate userC final NetscapeCertTypeExtension extn = new NetscapeCertTypeExtension(encoded); - if (!extn.get(NetscapeCertTypeExtension.OBJECT_SIGNING)) { + if (!hasObjectSigningExtension(extn)) { certs.get(certPath).setBadNetscapeCertType(); } } @@ -618,6 +620,18 @@ private void checkCertUsage(final CertPath certPath, final X509Certificate userC } } + private static boolean hasObjectSigningExtension(NetscapeCertTypeExtension extn) throws IOException { + // method return type of "NetscapeCertTypeExtension.get()" has changed from Boolean to boolean with Java 21 + try { + final Method getMethod = NetscapeCertTypeExtension.class.getDeclaredMethod("get", String.class); + final Object result = getMethod.invoke(extn, NetscapeCertTypeExtension.OBJECT_SIGNING); + return result == TRUE; + } catch (Exception e) { + LOG.error("Failed to get object_signing from extension", e); + return false; + } + } + /** * Returns if all jars are signed. *