From f20fbcd12cb8a6b1aa90c4bb4d1f6c0d71b7d104 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 22 Jul 2010 08:25:05 +0000
Subject: [PATCH] SAML2/SOAPClient: Rename $spMetadata to $srcMetadata.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2426 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SAML2/SOAPClient.php | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/SAML2/SOAPClient.php b/lib/SAML2/SOAPClient.php
index b2b047cfc..773ab9a68 100644
--- a/lib/SAML2/SOAPClient.php
+++ b/lib/SAML2/SOAPClient.php
@@ -15,9 +15,10 @@ class SAML2_SOAPClient {
* This function sends the SOAP message to the service location and returns SOAP response
*
* @param SAML2_Message $m The request that should be sent.
+ * @param SimpleSAML_Configuration $srcMetadata The metadata of the issuer of the message.
* @return SAML2_Message The response we received.
*/
- public function send(SAML2_Message $msg, SimpleSAML_Configuration $spMetadata) {
+ public function send(SAML2_Message $msg, SimpleSAML_Configuration $srcMetadata) {
$issuer = $msg->getIssuer();
@@ -27,15 +28,15 @@ class SAML2_SOAPClient {
);
// Determine if we are going to do a MutualSSL connection between the IdP and SP - Shoaib
- if ($spMetadata->hasValue('saml.SOAPClient.certificate')) {
- $options['local_cert'] = SimpleSAML_Utilities::resolveCert($spMetadata->getString('saml.SOAPClient.certificate'));
- if ($spMetadata->hasValue('saml.SOAPClient.privatekey_pass')) {
- $options['passphrase'] = $spMetadata->getString('saml.SOAPClient.privatekey_pass');
+ if ($srcMetadata->hasValue('saml.SOAPClient.certificate')) {
+ $options['local_cert'] = SimpleSAML_Utilities::resolveCert($srcMetadata->getString('saml.SOAPClient.certificate'));
+ if ($srcMetadata->hasValue('saml.SOAPClient.privatekey_pass')) {
+ $options['passphrase'] = $srcMetadata->getString('saml.SOAPClient.privatekey_pass');
}
} else {
/* Use the SP certificate and privatekey if it is configured. */
- $privateKey = SimpleSAML_Utilities::loadPrivateKey($spMetadata);
- $publicKey = SimpleSAML_Utilities::loadPublicKey($spMetadata);
+ $privateKey = SimpleSAML_Utilities::loadPrivateKey($srcMetadata);
+ $publicKey = SimpleSAML_Utilities::loadPublicKey($srcMetadata);
if ($privateKey !== NULL && $publicKey !== NULL && isset($publicKey['PEM'])) {
$keyCertData = $privateKey['PEM'] . $publicKey['PEM'];
$file = SimpleSAML_Utilities::getTempDir() . '/' . sha1($keyCertData) . '.pem';
--
GitLab