From 30c95ac04ea88b83940f85a93c7728f5ba37706d Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 21 Mar 2023 18:56:48 +0100
Subject: [PATCH] SASL always base64 by default

---
 snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php   | 1 -
 snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php | 1 -
 snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php   | 2 --
 snappymail/v/0.0.0/app/libraries/snappymail/sasl.php          | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
index 72a993d62..bcdbf48cf 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
@@ -146,7 +146,6 @@ class ImapClient extends \MailSo\Net\NetClient
 		}
 
 		$SASL = \SnappyMail\SASL::factory($type);
-		$SASL->base64 = true;
 
 		try
 		{
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
index 18bee7c6e..92a2bb491 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -107,7 +107,6 @@ class SieveClient extends \MailSo\Net\NetClient
 		}
 
 		$SASL = \SnappyMail\SASL::factory($type);
-		$SASL->base64 = true;
 
 		$bAuth = false;
 		try
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index 706165c4d..cffaeb056 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -136,7 +136,6 @@ class SmtpClient extends \MailSo\Net\NetClient
 		if ($this->Settings->authPlainLine) {
 			// https://github.com/the-djmaze/snappymail/issues/1038
 			$SASL = \SnappyMail\SASL::factory('PLAIN');
-			$SASL->base64 = true;
 			try
 			{
 				$sResult = $this->sendRequestWithCheck('AUTH', 235, 'PLAIN ' . $SASL->authenticate($sLogin, $sPassword));
@@ -150,7 +149,6 @@ class SmtpClient extends \MailSo\Net\NetClient
 		} else {
 			// Start authentication
 			$SASL = \SnappyMail\SASL::factory($type);
-			$SASL->base64 = true;
 
 			try
 			{
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
index fd446371e..e022278af 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
@@ -4,7 +4,7 @@ namespace SnappyMail;
 
 abstract class SASL
 {
-	public bool $base64 = false;
+	public bool $base64 = true;
 
 	abstract public function authenticate(string $authcid, string $passphrase, ?string $authzid = null) : string;