diff options
author | jim-p <jimp@pfsense.org> | 2015-12-03 17:22:43 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2015-12-03 17:22:43 -0500 |
commit | 7039bd10d12d81879d7a1c03d4e4cd5fa3aab938 (patch) | |
tree | efe7114cdc7ff982477fbbd2bf756eb89f31aa83 /config/autoconfigbackup/autoconfigbackup.inc | |
parent | cbc591cad92ac42aa15aab2f377b13c4341a7685 (diff) | |
download | pfsense-packages-7039bd10d12d81879d7a1c03d4e4cd5fa3aab938.tar.gz pfsense-packages-7039bd10d12d81879d7a1c03d4e4cd5fa3aab938.tar.bz2 pfsense-packages-7039bd10d12d81879d7a1c03d4e4cd5fa3aab938.zip |
More ACB SSL_VERIFYPEER fixes. Fixes #5560
Diffstat (limited to 'config/autoconfigbackup/autoconfigbackup.inc')
-rw-r--r-- | config/autoconfigbackup/autoconfigbackup.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/autoconfigbackup/autoconfigbackup.inc b/config/autoconfigbackup/autoconfigbackup.inc index 704fd165..f7baf74b 100644 --- a/config/autoconfigbackup/autoconfigbackup.inc +++ b/config/autoconfigbackup/autoconfigbackup.inc @@ -145,7 +145,6 @@ function test_connection($post) { } 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); curl_setopt($curl_session, CURLOPT_CONNECTTIMEOUT, 55); @@ -260,7 +259,12 @@ function upload_config($reasonm = "") { curl_setopt($curl_session, CURLOPT_POST, count($post_fields)); curl_setopt($curl_session, CURLOPT_POSTFIELDS, $fields_string); curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 0); + 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_CONNECTTIMEOUT, 55); curl_setopt($curl_session, CURLOPT_TIMEOUT, 30); curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_name'] . '/' . rtrim(file_get_contents("/etc/version"))); |