diff options
| author | Olav Morken <olav.morken@uninett.no> | 2011-03-07 13:25:01 +0000 |
|---|---|---|
| committer | Olav Morken <olav.morken@uninett.no> | 2011-03-07 13:25:01 +0000 |
| commit | c65dba2f85a7913508909ec0419b26d73ac4f802 (patch) | |
| tree | 6adb47a8699b18a5dfe8be5ba9c8bb7208c91712 | |
| parent | bfdbb6da9d51130bc6cf72d11cbffc7292192733 (diff) | |
| download | simplesamlphp-c65dba2f85a7913508909ec0419b26d73ac4f802.zip simplesamlphp-c65dba2f85a7913508909ec0419b26d73ac4f802.tar.gz simplesamlphp-c65dba2f85a7913508909ec0419b26d73ac4f802.tar.bz2 | |
SAML2_SOAPClient: Add option to disable the inclusion of client certificates.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2750 44740490-163a-0410-bde0-09ae8108e29a
| -rw-r--r-- | lib/SAML2/SOAPClient.php | 9 | ||||
| -rw-r--r-- | modules/saml/docs/sp.txt | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/SAML2/SOAPClient.php b/lib/SAML2/SOAPClient.php index fc1824f..15b0690 100644 --- a/lib/SAML2/SOAPClient.php +++ b/lib/SAML2/SOAPClient.php @@ -31,9 +31,12 @@ class SAML2_SOAPClient { // Determine if we are going to do a MutualSSL connection between the IdP and SP - Shoaib if ($srcMetadata->hasValue('saml.SOAPClient.certificate')) { - $ctxOpts['ssl']['local_cert'] = SimpleSAML_Utilities::resolveCert($srcMetadata->getString('saml.SOAPClient.certificate')); - if ($srcMetadata->hasValue('saml.SOAPClient.privatekey_pass')) { - $ctxOpts['ssl']['passphrase'] = $srcMetadata->getString('saml.SOAPClient.privatekey_pass'); + $cert = $srcMetadata->getValue('saml.SOAPClient.certificate'); + if ($cert !== FALSE) { + $ctxOpts['ssl']['local_cert'] = SimpleSAML_Utilities::resolveCert($srcMetadata->getString('saml.SOAPClient.certificate')); + if ($srcMetadata->hasValue('saml.SOAPClient.privatekey_pass')) { + $ctxOpts['ssl']['passphrase'] = $srcMetadata->getString('saml.SOAPClient.privatekey_pass'); + } } } else { /* Use the SP certificate and privatekey if it is configured. */ diff --git a/modules/saml/docs/sp.txt b/modules/saml/docs/sp.txt index 7d4fd1f..9c7bc94 100644 --- a/modules/saml/docs/sp.txt +++ b/modules/saml/docs/sp.txt @@ -241,6 +241,8 @@ Options : A file with a certificate _and_ private key that should be used when issuing SOAP requests from this SP. If this option isn't specified, the SP private key and certificate will be used. +: This option can also be set to `FALSE`, in which case no client certificate will be used. + `saml.SOAPClient.privatekey_pass` : The passphrase of the privatekey in `saml.SOAPClient.certificate`. |