From eff82881e2815a6b83d9a703f8e5f4a4b81623a5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 16 Jan 2021 13:22:54 +0100
Subject: [PATCH] Fix build after merging #1418
---
lib/SimpleSAML/Utils/Crypto.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index 681c7a8a1..3b711f6e6 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -429,7 +429,9 @@ class Crypto
throw new \InvalidArgumentException('Invalid input parameters.');
}
- if (!is_null(password_get_info($password)['algo'])) {
+ // Prior to PHP 7.4 password_get_info() would set the algo to 0 instead of NULL when it's not detected
+ $info = password_get_info($password);
+ if ($info['algo'] !== null && $info['algo'] !== 0) {
throw new Error\Exception("Cannot use a hash value for authentication.");
}
--
GitLab