From: pdontthink Date: Tue, 21 Jan 2014 03:47:03 +0000 (+0000) Subject: Allow SSL socket context to be specified as well X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0e6fd2f821eddd307a1c42df6c9362e2d19020e9;p=squirrelmail.git Allow SSL socket context to be specified as well git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14433 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php index 641fbe79..fc61d352 100644 --- a/class/deliver/Deliver_SMTP.class.php +++ b/class/deliver/Deliver_SMTP.class.php @@ -98,8 +98,6 @@ class Deliver_SMTP extends Deliver { if ((check_php_version(4,3)) && (extension_loaded('openssl'))) { if (function_exists('stream_socket_client')) { $server_address = 'ssl://' . $host . ':' . $port; - if (!empty($ssl_options)) - $ssl_options = array('ssl' => $ssl_options); $ssl_context = @stream_context_create($ssl_options); $connect_timeout = ini_get('default_socket_timeout'); // null timeout is broken diff --git a/config/config_local.example.php b/config/config_local.example.php index bcb482c6..eb425007 100644 --- a/config/config_local.example.php +++ b/config/config_local.example.php @@ -54,26 +54,32 @@ * * $smtpSslOptions allows more control over the SSL context used * when connecting to the SMTP server over SSL/TLS. See: + * http://www.php.net/manual/context.php and in particular * http://php.net/manual/context.ssl.php * For example, you can specify a CA file that corresponds * to your server's certificate and make sure that the * server's certificate is validated when connecting: * $smtpSslOptions = array( - * 'cafile' => '/etc/pki/tls/certs/ca-bundle.crt', - * 'verify_peer' => true, - * 'verify_depth' => 3, + * 'ssl' => array( + * 'cafile' => '/etc/pki/tls/certs/ca-bundle.crt', + * 'verify_peer' => true, + * 'verify_depth' => 3, + * ), * ); * * $imapSslOptions allows more control over the SSL context used * when connecting to the IMAP server over SSL/TLS. See: + * http://www.php.net/manual/context.php and in particular * http://php.net/manual/context.ssl.php * For example, you can specify a CA file that corresponds * to your server's certificate and make sure that the * server's certificate is validated when connecting: * $imapSslOptions = array( - * 'cafile' => '/etc/pki/tls/certs/ca-bundle.crt', - * 'verify_peer' => true, - * 'verify_depth' => 3, + * 'ssl' => array( + * 'cafile' => '/etc/pki/tls/certs/ca-bundle.crt', + * 'verify_peer' => true, + * 'verify_depth' => 3, + * ), * ); */ diff --git a/functions/imap_general.php b/functions/imap_general.php index cb6dfe78..56cc9bae 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -691,8 +691,6 @@ function sqimap_create_stream($server,$port,$tls=0,$ssl_options=array()) { if ((check_php_version(4,3)) and (extension_loaded('openssl'))) { if (function_exists('stream_socket_client')) { $server_address = 'ssl://' . $server . ':' . $port; - if (!empty($ssl_options)) - $ssl_options = array('ssl' => $ssl_options); $ssl_context = @stream_context_create($ssl_options); $connect_timeout = ini_get('default_socket_timeout'); // null timeout is broken