From 26d5c8fa74c3138bc28d918dabc900770bcfc83e Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 18 Jun 2008 08:55:38 +0000
Subject: [PATCH] Roll back parts of commit 251.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@668 44740490-163a-0410-bde0-09ae8108e29a
---
lib/xmlseclibs.php | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/xmlseclibs.php b/lib/xmlseclibs.php
index 27830a543..54062a201 100644
--- a/lib/xmlseclibs.php
+++ b/lib/xmlseclibs.php
@@ -353,10 +353,9 @@ class XMLSecurityKey {
}
if ($this->cryptParams['library'] == 'openssl') {
if ($this->cryptParams['type'] == 'public') {
- if ($isCert) {
- /* Load the fingerprint if this is an X509 certificate. */
- $this->X509Fingerprint = self::calculateX509Fingerprint($this->key);
- }
+ /* Load the fingerprint if this is an X509 certificate. */
+ $this->X509Fingerprint = self::calculateX509Fingerprint($this->key);
+
$this->key = openssl_get_publickey($this->key);
} else {
$this->key = openssl_get_privatekey($this->key, $this->passphrase);
--
GitLab