Skip to content
Snippets Groups Projects
Commit 26d5c8fa authored by Olav Morken's avatar Olav Morken
Browse files

Roll back parts of commit 251.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@668 44740490-163a-0410-bde0-09ae8108e29a
parent 5832b4de
No related branches found
No related tags found
No related merge requests found
...@@ -353,10 +353,9 @@ class XMLSecurityKey { ...@@ -353,10 +353,9 @@ class XMLSecurityKey {
} }
if ($this->cryptParams['library'] == 'openssl') { if ($this->cryptParams['library'] == 'openssl') {
if ($this->cryptParams['type'] == 'public') { if ($this->cryptParams['type'] == 'public') {
if ($isCert) { /* Load the fingerprint if this is an X509 certificate. */
/* Load the fingerprint if this is an X509 certificate. */ $this->X509Fingerprint = self::calculateX509Fingerprint($this->key);
$this->X509Fingerprint = self::calculateX509Fingerprint($this->key);
}
$this->key = openssl_get_publickey($this->key); $this->key = openssl_get_publickey($this->key);
} else { } else {
$this->key = openssl_get_privatekey($this->key, $this->passphrase); $this->key = openssl_get_privatekey($this->key, $this->passphrase);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment