summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML/Utils
diff options
context:
space:
mode:
authorJaime Pérez Crespo <jaime.perez@uninett.no>2016-09-14 12:05:50 +0200
committerGitHub <noreply@github.com>2016-09-14 12:05:50 +0200
commit3dce12324651c899062d0a36c16600282a7b9ddc (patch)
tree24755253c50ab5efb6c756b9878b81628d051c91 /lib/SimpleSAML/Utils
parent0edda0fcfb02db4cb73979ce49d047ede22c35cc (diff)
parent2cebbd34ab71bee73089d5d78b123d240a257082 (diff)
downloadsimplesamlphp-3dce12324651c899062d0a36c16600282a7b9ddc.zip
simplesamlphp-3dce12324651c899062d0a36c16600282a7b9ddc.tar.gz
simplesamlphp-3dce12324651c899062d0a36c16600282a7b9ddc.tar.bz2
Merge pull request #433 from thijskh/feature/deprecate-certFingerprint
Deprecate the certFingerprint option.
Diffstat (limited to 'lib/SimpleSAML/Utils')
-rw-r--r--lib/SimpleSAML/Utils/Crypto.php4
1 files changed, 2 insertions, 2 deletions
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