From 91765e22b0792a6ea3ec300dcdaf537d202e200a Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Mon, 7 Oct 2019 20:30:20 +0200
Subject: [PATCH] Properly handle privatekey_pass set to null-value
---
lib/SimpleSAML/Utils/Crypto.php | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index 131610592..a3f5b2372 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -222,12 +222,9 @@ class Crypto
$ret = [
'PEM' => $data,
+ 'password' => $metadata->getString($prefix . 'privatekey_pass', null),
];
- if ($metadata->hasValue($prefix . 'privatekey_pass')) {
- $ret['password'] = $metadata->getString($prefix . 'privatekey_pass');
- }
-
return $ret;
}
--
GitLab