Skip to content
Closed
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public MacAppBundler() {
}

if (result != null) {
MacCertificate certificate = new MacCertificate(result);
MacCertificate certificate = new MacCertificate(result, keychain);

if (!certificate.isValid()) {
Log.error(MessageFormat.format(I18N.getString(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2025, 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 @@ -39,21 +39,25 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HexFormat;
import java.util.List;
import java.util.Locale;
import java.util.HexFormat;
import java.util.Objects;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public final class MacCertificate {
private final String certificate;
private final Optional<String> keychainName;

public MacCertificate(String certificate) {
this.certificate = certificate;
public MacCertificate(String certificate, String keychainName) {
this.certificate = Objects.requireNonNull(certificate);
this.keychainName = Optional.ofNullable(keychainName);
}

public boolean isValid() {
return verifyCertificate(this.certificate);
return verifyCertificate();
}

public static String findCertificateKey(String keyPrefix, String teamName,
Expand Down Expand Up @@ -295,15 +299,15 @@ private Date findCertificateDate(String filename) {
return result;
}

private boolean verifyCertificate(String certificate) {
private boolean verifyCertificate() {
boolean result = false;

try {
Path file = null;
Date certificateDate = null;

try {
file = getFindCertificateOutputPEM(certificate, null);
file = getFindCertificateOutputPEM(certificate, keychainName.orElse(null));

if (file != null) {
certificateDate = findCertificateDate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
}

if (result != null) {
MacCertificate certificate = new MacCertificate(result);
MacCertificate certificate = new MacCertificate(result, keychain);

if (!certificate.isValid()) {
Log.error(MessageFormat.format(
Expand Down
Loading