From c2c72dc4be68c00077257e560a04e8134751c9e9 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 18 Mar 2024 17:51:56 +0100 Subject: [PATCH] Let PECL::isSupported() return false instead --- snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php | 4 +--- snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) 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 bbea8bbb0..09a8c769a 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 @@ -12,7 +12,7 @@ abstract class GnuPG { public static function isSupported() : bool { - return GPG::isSupported(); + return GPG::isSupported() || PECL::isSupported(); } private static $instance = null; @@ -22,11 +22,9 @@ abstract class GnuPG if (GPG::isSupported()) { static::$instance = new GPG($homedir); } -/* else if (PECL::isSupported()) { static::$instance = new PECL($homedir); } -*/ } return static::$instance; } diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php index a8582b578..d89ba02cc 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php @@ -56,7 +56,8 @@ class PECL implements \SnappyMail\PGP\PGPInterface public static function isSupported() : bool { - return \class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>='); + // Disabled due to failures with "no passphrase" while a passphrase does exist + return false && \class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>='); } public function gnupgError()