Enable use of TLSv1.1 and TLSv1.2 for IMAP.

Francis Russell

2016-01-07 6a70e56e5e59b1ac14f6cad765765252af3c6d1a

Enable use of TLSv1.1 and TLSv1.2 for IMAP.

Conflicts:

	CHANGELOG

 CHANGELOG

@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================

- Enable use of TLSv1.1 and TLSv1.2 for IMAP (#1490640)

RELEASE 1.0.8
-------------
- Add workaround for https://bugs.php.net/bug.php?id=70757 (#1490582)

 program/lib/Roundcube/rcube_imap_generic.php

@@ -912,7 +912,13 @@
                return false;
            }

            if (!stream_socket_enable_crypto($this->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
            // There is no flag to enable all TLS methods. Net_SMTP
            // handles enabling TLS similarly.
            $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT
                | @STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT
                | @STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;

            if (!stream_socket_enable_crypto($this->fp, true, $crypto_method)) {
                $this->setError(self::ERROR_BAD, "Unable to negotiate TLS");
                $this->closeConnection();
                return false;