the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

SHA-512 #182

Browse source
This commit is contained in:
djmaze 2022-01-08 11:46:35 +01:00
parent 27161cd258
commit 29fa090795
4 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -139,6 +139,7 @@ class ImapClient extends \MailSo\Net\NetClient
$type = $this->IsSupported('LOGINDISABLED') ? '' : 'LOGIN'; // RFC3501 6.2.3
$types = [
// if !$encrypted:
// 'SCRAM-SHA-512' => 1,
// 'SCRAM-SHA-256' => 1,
// 'SCRAM-SHA-1' => 1,
// if $encrypted:

3
snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
View file

@ -111,8 +111,11 @@ class ManageSieveClient extends \MailSo\Net\NetClient
// $encrypted = !empty(\stream_get_meta_data($this->ConnectionResource())['crypto']);
$type = '';
$types = [
// if !$encrypted:
// 'SCRAM-SHA-512' => 1, // !$encrypted
// 'SCRAM-SHA-256' => 1, // !$encrypted
// 'SCRAM-SHA-1' => 1, // !$encrypted
// if $encrypted:
// 'CRAM-MD5' => 1, // $encrypted
'OAUTHBEARER' => $aCredentials['UseAuthOAuth2IfSupported'],
'XOAUTH2' => $aCredentials['UseAuthOAuth2IfSupported'],

1
snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
View file

@ -126,6 +126,7 @@ class SmtpClient extends \MailSo\Net\NetClient
$type = '';
$types = [
// if !$encrypted:
'SCRAM-SHA-512' => 1,
'SCRAM-SHA-256' => 1,
'SCRAM-SHA-1' => 1,
// if $encrypted:

1
snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
View file

@ -21,6 +21,7 @@ class Scram extends \SnappyMail\SASL
function __construct(string $algo)
{
if (\stripos($algo, '-PLUS')) {
// https://github.com/the-djmaze/snappymail/issues/182
throw new \Exception("SASL SCRAM channel binding unsupported: {$algo}");
}
$algo = \str_replace('sha-', 'sha', \strtolower($algo));