From 98eede7f68f8720842f81aa1133816da1ce9aab9 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 30 Nov 2020 13:23:02 +0100
Subject: [PATCH] Fix encryption test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
apps/encryption/lib/Crypto/Crypt.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/encryption/lib/Crypto/Crypt.php b/apps/encryption/lib/Crypto/Crypt.php
index 57aecf95633..94979bde866 100644
--- a/apps/encryption/lib/Crypto/Crypt.php
+++ b/apps/encryption/lib/Crypto/Crypt.php
@@ -444,7 +444,8 @@ class Crypt {
*/
protected function isValidPrivateKey($plainKey) {
$res = openssl_get_privatekey($plainKey);
- if (is_resource($res)) {
+ // TODO: remove resource check one php7.4 is not longer supported
+ if (is_resource($res) || (is_object($res) && get_class($res) === 'OpenSSLAsymmetricKey')) {
$sslInfo = openssl_pkey_get_details($res);
if (isset($sslInfo['key'])) {
return true;
--
GitLab