< prev index next >

modules/jdk.packager/src/main/java/com/oracle/tools/packager/mac/MacAppBundler.java

Print this page

        

@@ -49,10 +49,11 @@
 import java.util.ResourceBundle;
 
 import static com.oracle.tools.packager.StandardBundlerParam.*;
 import static com.oracle.tools.packager.mac.MacBaseInstallerBundler.*;
 import jdk.packager.builders.AbstractAppImageBuilder;
+import jdk.packager.internal.mac.MacCertificate;
 
 public class MacAppBundler extends AbstractImageBundler {
 
     private static final ResourceBundle I18N =
             ResourceBundle.getBundle(MacAppBundler.class.getName());

@@ -180,11 +181,24 @@
     public static final BundlerParamInfo<String> DEVELOPER_ID_APP_SIGNING_KEY = new StandardBundlerParam<>(
             I18N.getString("param.signing-key-developer-id-app.name"),
             I18N.getString("param.signing-key-developer-id-app.description"),
             "mac.signing-key-developer-id-app",
             String.class,
-            params -> MacBaseInstallerBundler.findKey("Developer ID Application: " + SIGNING_KEY_USER.fetchFrom(params), SIGNING_KEYCHAIN.fetchFrom(params), VERBOSE.fetchFrom(params)),
+            params -> {
+                    String result = MacBaseInstallerBundler.findKey("Developer ID Application: " + SIGNING_KEY_USER.fetchFrom(params),
+                                                                    SIGNING_KEYCHAIN.fetchFrom(params),
+                                                                    VERBOSE.fetchFrom(params));
+                    if (result != null) {
+                        MacCertificate certificate = new MacCertificate(result, VERBOSE.fetchFrom(params));
+
+                        if (!certificate.isValid()) {
+                            Log.info(MessageFormat.format(I18N.getString("error.certificate.expired"), result));
+                        }
+                    }
+
+                    return result;
+                },
             (s, p) -> s);
 
     public static final BundlerParamInfo<String> BUNDLE_ID_SIGNING_PREFIX = new StandardBundlerParam<>(
             I18N.getString("param.bundle-id-signing-prefix.name"),
             I18N.getString("param.bundle-id-signing-prefix.description"),
< prev index next >