Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Test change for #381

Browse source
This commit is contained in:
the-djmaze 2022-05-11 20:01:34 +02:00
parent be35be8908
commit 5f788dfda7
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
View file

@ -172,7 +172,10 @@ abstract class NetClient
'verify_host' => $bVerifySsl, 'verify_host' => $bVerifySsl,
'verify_peer' => $bVerifySsl, 'verify_peer' => $bVerifySsl,
'verify_peer_name' => $bVerifySsl, 'verify_peer_name' => $bVerifySsl,
'allow_self_signed' => $bVerifySsl ? $bAllowSelfSigned : true 'allow_self_signed' => $bVerifySsl ? $bAllowSelfSigned : true,
// 'ciphers' => 'HIGH:!SSLv2:!SSLv3',
'SNI_enabled' => true,
// 'disable_compression' => true
) )
); );
@ -224,29 +227,23 @@ abstract class NetClient
} }
} }
public function EnableCrypto() public function EnableCrypto(bool $insecure = true)
{ {
$bError = true; $bError = true;
if ($this->rConnect && if ($this->rConnect && \MailSo\Base\Utils::FunctionExistsAndEnabled('stream_socket_enable_crypto')) {
\MailSo\Base\Utils::FunctionExistsAndEnabled('stream_socket_enable_crypto')) $crypto_method = STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
{ if (\defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && OPENSSL_VERSION_NUMBER >= 0x10101000) {
switch (true) $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
{ }
case defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && OPENSSL_VERSION_NUMBER >= 0x10101000 && if ($insecure) {
\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT): $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
case defined('STREAM_CRYPTO_METHOD_ANY_CLIENT') && }
\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_ANY_CLIENT): if (\stream_socket_enable_crypto($this->rConnect, true, $crypto_method)) {
case defined('STREAM_CRYPTO_METHOD_TLS_CLIENT') &&
\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT):
case defined('STREAM_CRYPTO_METHOD_SSLv23_CLIENT') &&
\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT):
$bError = false; $bError = false;
break;
} }
} }
if ($bError) if ($bError) {
{
$this->writeLogException( $this->writeLogException(
new \MailSo\Net\Exceptions\Exception('Cannot enable STARTTLS.'), new \MailSo\Net\Exceptions\Exception('Cannot enable STARTTLS.'),
\MailSo\Log\Enumerations\Type::ERROR, true); \MailSo\Log\Enumerations\Type::ERROR, true);