adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-28 20:52:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Extend available TLS encrypt methods in CakeSocket

Browse source
This commit is contained in:
Marcin Stramek 2017-02-15 10:25:00 +01:00
parent aa8d708b9a
commit 6b17567ea7
1 changed files with 9 additions and 4 deletions

13
lib/Cake/Network/CakeSocket.php
View file

@ -44,7 +44,8 @@ class CakeSocket {
'host' => 'localhost', 'host' => 'localhost',
'protocol' => 'tcp', 'protocol' => 'tcp',
'port' => 80, 'port' => 80,
'timeout' => 30 'timeout' => 30,
'cryptoType' => 'tls'
); );
/** /**
@ -93,10 +94,14 @@ class CakeSocket {
'sslv3_client' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT, 'sslv3_client' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
'sslv23_client' => STREAM_CRYPTO_METHOD_SSLv23_CLIENT, 'sslv23_client' => STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
'tls_client' => STREAM_CRYPTO_METHOD_TLS_CLIENT, 'tls_client' => STREAM_CRYPTO_METHOD_TLS_CLIENT,
'tlsv1_1_client' => STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT,
'tlsv1_2_client' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
'sslv2_server' => STREAM_CRYPTO_METHOD_SSLv2_SERVER, 'sslv2_server' => STREAM_CRYPTO_METHOD_SSLv2_SERVER,
'sslv3_server' => STREAM_CRYPTO_METHOD_SSLv3_SERVER, 'sslv3_server' => STREAM_CRYPTO_METHOD_SSLv3_SERVER,
'sslv23_server' => STREAM_CRYPTO_METHOD_SSLv23_SERVER, 'sslv23_server' => STREAM_CRYPTO_METHOD_SSLv23_SERVER,
'tls_server' => STREAM_CRYPTO_METHOD_TLS_SERVER 'tls_server' => STREAM_CRYPTO_METHOD_TLS_SERVER,
'tlsv1_1_server' => STREAM_CRYPTO_METHOD_TLSv1_1_SERVER,
'tlsv1_2_server' => STREAM_CRYPTO_METHOD_TLSv1_2_SERVER
// @codingStandardsIgnoreEnd // @codingStandardsIgnoreEnd
); );
@ -205,7 +210,7 @@ class CakeSocket {
} }
} }
$this->enableCrypto('tls', 'client'); $this->enableCrypto($this->config['cryptoType'], 'client');
} }
} }
return $this->connected; return $this->connected;
@ -433,7 +438,7 @@ class CakeSocket {
/** /**
* Encrypts current stream socket, using one of the defined encryption methods. * Encrypts current stream socket, using one of the defined encryption methods.
* *
* @param string $type Type which can be one of 'sslv2', 'sslv3', 'sslv23' or 'tls'. * @param string $type Type which can be one of 'sslv2', 'sslv3', 'sslv23', 'tls', 'tlsv1_1' or 'tlsv1_2'.
* @param string $clientOrServer Can be one of 'client', 'server'. Default is 'client'. * @param string $clientOrServer Can be one of 'client', 'server'. Default is 'client'.
* @param bool $enable Enable or disable encryption. Default is true (enable) * @param bool $enable Enable or disable encryption. Default is true (enable)
* @return bool True on success * @return bool True on success