From e4c09afba6341010cadf6d9c53b147b59b52e623 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 10 Aug 2010 11:26:45 +0000
Subject: [PATCH] saml/idp/SAML2: Encrypt assertion using encryption key.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2510 44740490-163a-0410-bde0-09ae8108e29a
---
modules/saml/lib/IdP/SAML2.php | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index 7592ecd46..00686c28a 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -671,18 +671,21 @@ class sspmod_saml_IdP_SAML2 {
$key = new XMLSecurityKey(XMLSecurityKey::AES128_CBC);
$key->loadKey($sharedKey);
} else {
- /* Find the certificate that we should use to encrypt messages to this SP. */
- $certArray = SimpleSAML_Utilities::loadPublicKey($spMetadata, TRUE);
- if (!array_key_exists('PEM', $certArray)) {
- throw new Exception('Unable to locate key we should use to encrypt the assertionst ' .
- 'to the SP: ' . var_export($spMetadata->getString('entityid'), TRUE) . '.');
+ $keys = $spMetadata->getPublicKeys('encryption', TRUE);
+ $key = $keys[0];
+ switch ($key['type']) {
+ case 'X509Certificate':
+ $pemKey = "-----BEGIN CERTIFICATE-----\n" .
+ chunk_split($key['X509Certificate'], 64) .
+ "-----END CERTIFICATE-----\n";
+ break;
+ default:
+ throw new SimpleSAML_Error_Exception('Unsupported encryption key type: ' . $key['type']);
}
- $pemCert = $certArray['PEM'];
-
/* Extract the public key from the certificate for encryption. */
$key = new XMLSecurityKey(XMLSecurityKey::RSA_1_5, array('type'=>'public'));
- $key->loadKey($pemCert);
+ $key->loadKey($pemKey);
}
$ea = new SAML2_EncryptedAssertion();
--
GitLab