aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-12-01 16:56:51 -0600
committerChris Buechler <cmb@pfsense.org>2015-12-01 16:56:51 -0600
commited94a2663b00fe7d5c7bf20443b043fe420dc659 (patch)
tree17a6e70840116d97f8e6a25ab901c332532df3ab
parent26f41b6b1136ac5216cd748c6e5e5254275c88a5 (diff)
downloadpfsense-packages-ed94a2663b00fe7d5c7bf20443b043fe420dc659.tar.gz
pfsense-packages-ed94a2663b00fe7d5c7bf20443b043fe420dc659.tar.bz2
pfsense-packages-ed94a2663b00fe7d5c7bf20443b043fe420dc659.zip
Enable VERIFYPEER for AutoConfigBackup on 2.2 and newer. Ticket #5560
-rw-r--r--config/autoconfigbackup/autoconfigbackup.inc6
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 9 insertions, 3 deletions
diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc
index abfe1a28..704fd165 100644
--- a/config/autoconfigbackup/autoconfigbackup.inc
+++ b/config/autoconfigbackup/autoconfigbackup.inc
@@ -139,6 +139,12 @@ function test_connection($post) {
$curl_session = curl_init();
curl_setopt($curl_session, CURLOPT_URL, $get_url);
curl_setopt($curl_session, CURLOPT_HTTPHEADER, array("Authorization: Basic " . base64_encode("{$username}:{$password}")));
+ if ($pf_version < 2.2) {
+ // pre-2.2 doesn't have ca-root-nss
+ curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 0);
+ } else {
+ curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 1);
+ }
curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 0);
curl_setopt($curl_session, CURLOPT_POST, 1);
curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 8e455bc5..343f2575 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -772,7 +772,7 @@
</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.32</version>
+ <version>1.33</version>
<status>RELEASE</status>
<required_version>2.2</required_version>
<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 1040190f..1115a2be 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -814,7 +814,7 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.32</version>
+ <version>1.33</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index d6d9b6dd..c8a2d1c3 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -801,7 +801,7 @@
<descr>Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server. Requires Gold Subscription from https://portal.pfsense.org</descr>
<website>https://portal.pfsense.org</website>
<category>Services</category>
- <version>1.32</version>
+ <version>1.33</version>
<status>Stable</status>
<required_version>1.2</required_version>
<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>