diff --git a/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/forms/dialogService.xml b/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/forms/dialogService.xml index dc8008bd9..2b7f7bb64 100644 --- a/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/forms/dialogService.xml +++ b/security/stunnel/src/opnsense/mvc/app/controllers/OPNsense/Stunnel/forms/dialogService.xml @@ -41,17 +41,6 @@ dropdown - - service.chainIntermediateCAs - - checkbox - true - - service.cacert diff --git a/security/stunnel/src/opnsense/mvc/app/models/OPNsense/Stunnel/Stunnel.xml b/security/stunnel/src/opnsense/mvc/app/models/OPNsense/Stunnel/Stunnel.xml index d81c05a6a..13e2f02fd 100644 --- a/security/stunnel/src/opnsense/mvc/app/models/OPNsense/Stunnel/Stunnel.xml +++ b/security/stunnel/src/opnsense/mvc/app/models/OPNsense/Stunnel/Stunnel.xml @@ -1,6 +1,6 @@ //OPNsense/Stunnel - 1.0.4 + 1.0.3 Stunnel TLS encryption proxy @@ -81,10 +81,6 @@ cert Please select a valid certificate from the list - - 0 - Y - N /^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u diff --git a/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php b/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php index a28ac6919..4aeb667e4 100755 --- a/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php +++ b/security/stunnel/src/opnsense/scripts/stunnel/generate_certs.php @@ -46,12 +46,10 @@ foreach ($stunnel->services->service->iterateItems() as $service) { foreach ($configObj->cert as $cert) { if ($srv_certid == (string)$cert->refid) { $all_certs["{$base_path}/{$this_uuid}.crt"] = base64_decode((string)$cert->crt); - if (!empty((string)$service->chainIntermediateCAs)) { - $certArr = (array)$cert; - $chain = ca_chain($certArr); - if (!empty($chain)) { - $all_certs["{$base_path}/{$this_uuid}.crt"] .= "\n" . $chain; - } + $certArr = (array)$cert; + $chain = ca_chain($certArr); + if (!empty($chain)) { + $all_certs["{$base_path}/{$this_uuid}.crt"] .= "\n" . $chain; } $all_certs["{$base_path}/{$this_uuid}.crt"] .= "\n" . base64_decode((string)$cert->prv); }