summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML
diff options
context:
space:
mode:
authorThijs Kinkhorst <thijs@kinkhorst.com>2016-08-05 14:46:02 +0000
committerThijs Kinkhorst <thijs@kinkhorst.com>2016-08-05 14:46:02 +0000
commit2cebbd34ab71bee73089d5d78b123d240a257082 (patch)
treecf427905a138d68168ea68f2521d3a27614ee104 /lib/SimpleSAML
parent0c123e9a4600835b12f63309e05a1c9541a0bdfb (diff)
downloadsimplesamlphp-2cebbd34ab71bee73089d5d78b123d240a257082.zip
simplesamlphp-2cebbd34ab71bee73089d5d78b123d240a257082.tar.gz
simplesamlphp-2cebbd34ab71bee73089d5d78b123d240a257082.tar.bz2
Deprecate the certFingerprint option.
Issue a notice when the option is used nonetheless. Closes: #432
Diffstat (limited to 'lib/SimpleSAML')
-rw-r--r--lib/SimpleSAML/Metadata/SAMLParser.php4
-rw-r--r--lib/SimpleSAML/Utils/Crypto.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index edb3909..7a4bc25 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -604,7 +604,7 @@ class SimpleSAML_Metadata_SAMLParser
* - 'SingleSignOnService': String with the URL of the SSO service which supports the redirect binding.
* - 'SingleLogoutService': String with the URL where we should send logout requests/responses.
* - 'certData': X509Certificate for entity (if present).
- * - 'certFingerprint': Fingerprint of the X509Certificate from the metadata.
+ * - 'certFingerprint': Fingerprint of the X509Certificate from the metadata. (deprecated)
*
* Metadata must be loaded with one of the parse functions before this function can be called.
*
@@ -757,7 +757,7 @@ class SimpleSAML_Metadata_SAMLParser
* the 'SingleLogoutService' endpoint.
* - 'NameIDFormats': The name ID formats this IdP supports.
* - 'certData': X509Certificate for entity (if present).
- * - 'certFingerprint': Fingerprint of the X509Certificate from the metadata.
+ * - 'certFingerprint': Fingerprint of the X509Certificate from the metadata. (deprecated)
*
* Metadata must be loaded with one of the parse functions before this function can be called.
*
diff --git a/lib/SimpleSAML/Utils/Crypto.php b/lib/SimpleSAML/Utils/Crypto.php
index 269ed1b..f27a9b0 100644
--- a/lib/SimpleSAML/Utils/Crypto.php
+++ b/lib/SimpleSAML/Utils/Crypto.php
@@ -178,12 +178,12 @@ class Crypto
* - 'certData': The certificate as a base64-encoded string.
* - 'certificate': A file with a certificate or public key in PEM-format.
* - 'certFingerprint': The fingerprint of the certificate. Can be a single fingerprint, or an array of multiple
- * valid fingerprints.
+ * valid fingerprints. (deprecated)
*
* This function will return an array with these elements:
* - 'PEM': The public key/certificate in PEM-encoding.
* - 'certData': The certificate data, base64 encoded, on a single line. (Only present if this is a certificate.)
- * - 'certFingerprint': Array of valid certificate fingerprints. (Only present if this is a certificate.)
+ * - 'certFingerprint': Array of valid certificate fingerprints. (Deprecated. Only present if this is a certificate.)
*
* @param \SimpleSAML_Configuration $metadata The metadata.
* @param bool $required Whether the private key is required. If this is TRUE, a missing key