From b6bbd6a32e60e55f6cddb62598853645ee644922 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 15 Feb 2021 21:57:56 +0100
Subject: [PATCH] security/acme-client: fix OCSP setting not honored, closes
 #2234

---
 security/acme-client/pkg-descr                  |   1 +
 .../OPNsense/AcmeClient/LeCertificate.php       |   1 +
 .../OPNsense/AcmeClient/.AcmeClient.xml.swp     | Bin 0 -> 16384 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/.AcmeClient.xml.swp

diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index 2d89753b0..213eb1121 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -17,6 +17,7 @@ Fixed:
 * fix missing "--ecc" parameter when renewing ECC certs (#2223)
 * fix log file location (#2227)
 * fix GUI log formatting (by using the syslog log)
+* fix OCSP setting not honored (#2234)
 
 Changed:
 * let acme.sh log through syslog
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
index 8e0be409e..6855acb3b 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
@@ -656,6 +656,7 @@ class LeCertificate extends LeCommon
             $val->setNames($this->config->name, $this->config->altNames, $this->config->aliasmode, $this->config->domainalias, $this->config->challengealias);
             $val->setRenewal((int)$this->config->renewInterval);
             $val->setForce($this->force);
+            $val->setOcsp((string)$this->config->ocsp == 1 ? true : false);
             // strip prefix from key value
             $val->setKey(substr($this->config->keyLength, 4));
             $val->prepare();
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/.AcmeClient.xml.swp b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/.AcmeClient.xml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..cb9344443839d7d3a58e6d925c166511fd93baf8
GIT binary patch
literal 16384
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
b3rH!1gH<tsQA4m<q%@6DLI)bCsDpz5F`dwM

literal 0
HcmV?d00001