From e7958fb1edc082581ebf29114bbccfb04eab7231 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 11 Nov 2022 22:50:32 +0100
Subject: [PATCH] Resolve #657

---
 snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php | 2 +-
 .../v/0.0.0/app/libraries/RainLoop/Config/Application.php   | 2 +-
 snappymail/v/0.0.0/app/libraries/snappymail/crypt.php       | 4 ++--
 snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index dc8e191e0..ed40d00fa 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -619,7 +619,7 @@ class MailClient
 		}
 		catch (\MailSo\RuntimeException $oException)
 		{
-			\SnappyMail\Log::warning('MessageListThreadsMap ' . $oException->getMessage());
+			\SnappyMail\Log::warning('MailClient', 'MessageListThreadsMap ' . $oException->getMessage());
 			unset($oException);
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 33b04882c..cf2dd68e2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -41,7 +41,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 		$sCipher = $this->Get('security', 'encrypt_cipher', '');
 		if (!$sCipher || !\SnappyMail\Crypt::cipherSupported($sCipher)) {
-			$sCipher && \SnappyMail\Log::warning("OpenSSL does not support {$sCipher}");
+			$sCipher && \SnappyMail\Log::warning('OpenSSL', "No support for {$sCipher}");
 			$aCiphers = \SnappyMail\Crypt::listCiphers();
 			$this->Set('security', 'encrypt_cipher', $aCiphers[\array_rand($aCiphers)]);
 			$this->Save();
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
index 44857b46e..8b9b015f9 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -99,14 +99,14 @@ abstract class Crypt
 			$nonce = \random_bytes(\SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES);
 			return ['sodium', $nonce, static::SodiumEncrypt($data, $nonce, $key)];
 		} catch (\Throwable $e) {
-			Log::error($e->getMessage());
+			Log::error('Sodium', $e->getMessage());
 		}
 
 		try {
 			$iv = \random_bytes(\openssl_cipher_iv_length(static::$cipher));
 			return ['openssl', $iv, static::OpenSSLEncrypt($data, $iv, $key)];
 		} catch (\Throwable $e) {
-			Log::error($e->getMessage());
+			Log::error('OpenSSL', $e->getMessage());
 		}
 
 		$salt = \random_bytes(16);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
index 7e8382c17..a757d186e 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
@@ -383,10 +383,10 @@ class GnuPG
 			: $this->GPG->verify($signed_text, $signature, $plaintext);
 		if (!$result) {
 			if ($this->GnuPG) {
-				\SnappyMail\Log::notice('gnupg_verify() failed: ' . $this->GnuPG->geterror());
-				\SnappyMail\Log::info(\print_r($this->GnuPG->geterrorinfo(),1));
+				\SnappyMail\Log::notice('GnuPG', 'gnupg_verify() failed: ' . $this->GnuPG->geterror());
+				\SnappyMail\Log::info('GnuPG', \print_r($this->GnuPG->geterrorinfo(),1));
 			} else {
-				\SnappyMail\Log::notice('GPG->verify() failed');
+				\SnappyMail\Log::notice('GPG', 'GPG->verify() failed');
 			}
 		}
 		return $result;