From e7007a42a2153dbee03dc12c384e09e092a61c34 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 21 Feb 2023 15:39:41 +0100
Subject: [PATCH] VPN/OpenVPN/Client Export - fix openssl_pkcs12_export():
 Passing null to parameter #4 ($passphrase) of type string is deprecated

---
 .../mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php       | 4 ++--
 .../mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
index 4a3834df8..cc1fa15c6 100644
--- a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
+++ b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
@@ -80,8 +80,8 @@ class ArchiveOpenVPN extends PlainOpenVPN
                 $p12 = $this->export_pkcs12(
                     $this->config['client_crt'],
                     $this->config['client_prv'],
-                    !empty($this->config['p12_password']) ? $this->config['p12_password'] : null,
-                    !empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : null
+                    !empty($this->config['p12_password']) ? $this->config['p12_password'] : '',
+                    !empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : ''
                 );
 
                 file_put_contents("{$content_dir}/{$base_filename}.p12", $p12);
diff --git a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php
index 9e25ce7ae..d62e85901 100644
--- a/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php
+++ b/src/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php
@@ -114,8 +114,8 @@ class ViscosityVisz extends PlainOpenVPN
                 $p12 = $this->export_pkcs12(
                     $this->config['client_crt'],
                     $this->config['client_prv'],
-                    !empty($this->config['p12_password']) ? $this->config['p12_password'] : null,
-                    !empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : null
+                    !empty($this->config['p12_password']) ? $this->config['p12_password'] : '',
+                    !empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : ''
                 );
 
                 file_put_contents("{$content_dir}/pkcs.p12", $p12);