Merge pull request #16 from JacobBrownAustin/MAGECLOUD-2521

MAGECLOUD-2521: Use TLS 1.2
magento · Aug 9, 2018 · 4df0182 · 4df0182
2 parents 48ac5e3 + ca78164
commit 4df0182
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/library/Zend/Http/Client/Adapter/Proxy.php b/library/Zend/Http/Client/Adapter/Proxy.php
@@ -297,10 +297,8 @@ protected function connectHandshake(
         // If all is good, switch socket to secure mode. We have to fall back
         // through the different modes
         $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+            // TODO: Add STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT in the future when it is supported by PHP
+            STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
         );
 
         $success = false;

diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php
@@ -111,7 +111,8 @@ public function connect($host, $port = null, $ssl = false)
 
         if ($ssl === 'TLS') {
             $result = $this->requestAndResponse('STARTTLS');
-            $result = $result && stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+            // TODO: Add STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT in the future when it is supported by PHP
+            $result = $result && stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
             if (!$result) {
                 /**
                  * @see Zend_Mail_Protocol_Exception

diff --git a/library/Zend/Mail/Protocol/Pop3.php b/library/Zend/Mail/Protocol/Pop3.php
@@ -122,7 +122,8 @@ public function connect($host, $port = null, $ssl = false)
 
         if ($ssl === 'TLS') {
             $this->request('STLS');
-            $result = stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+            // TODO: Add STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT in the future when it is supported by PHP
+            $result = stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
             if (!$result) {
                 /**
                  * @see Zend_Mail_Protocol_Exception

diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php
@@ -203,7 +203,8 @@ public function helo($host = '127.0.0.1')
         if ($this->_secure == 'tls') {
             $this->_send('STARTTLS');
             $this->_expect(220, 180);
-            if (!stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+            // TODO: Add STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT in the future when it is supported by PHP
+            if (!stream_socket_enable_crypto($this->_socket, true, STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT)) {
                 /**
                  * @see Zend_Mail_Protocol_Exception
                  */