From d2ab4711ec86b6f5f10d7ebe95b20fb4b9f61a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez?= <jaime.perez@uninett.no>
Date: Tue, 10 Jan 2017 11:43:30 +0100
Subject: [PATCH] Remove private, old der2pem() and pem2der() methods in
X509userCert.
---
.../authX509/lib/Auth/Source/X509userCert.php | 33 +------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git a/modules/authX509/lib/Auth/Source/X509userCert.php b/modules/authX509/lib/Auth/Source/X509userCert.php
index 74729dd16..7b323af54 100644
--- a/modules/authX509/lib/Auth/Source/X509userCert.php
+++ b/modules/authX509/lib/Auth/Source/X509userCert.php
@@ -62,37 +62,6 @@ class sspmod_authX509_Auth_Source_X509userCert extends SimpleSAML_Auth_Source
}
- /**
- * Convert certificate from PEM to DER
- *
- * @param array $pem_data PEM-encoded certificate
- */
- private function pem2der($pem_data)
- {
- $begin = "CERTIFICATE-----";
- $end = "-----END";
- $pem_data = substr($pem_data,
- strpos($pem_data, $begin)+strlen($begin));
- $pem_data = substr($pem_data, 0, strpos($pem_data, $end));
- $der = base64_decode($pem_data);
- return $der;
- }
-
-
- /**
- * Convert certificate from DER to PEM
- *
- * @param array $der_data DER-encoded certificate
- */
- private function der2pem($der_data)
- {
- $pem = chunk_split(base64_encode($der_data), 64, "\n");
- $pem = "-----BEGIN CERTIFICATE-----\n".$pem.
- "-----END CERTIFICATE-----\n";
- return $pem;
- }
-
-
/**
* Finish a failed authentication.
*
@@ -202,7 +171,7 @@ class sspmod_authX509_Auth_Source_X509userCert extends SimpleSAML_Auth_Source
$ldap_certs = $merged_ldapcerts;
foreach ($ldap_certs as $ldap_cert) {
- $pem = $this->der2pem($ldap_cert);
+ $pem = \SimpleSAML\Utils\Crypto::der2pem($ldap_cert);
$ldap_cert_data = openssl_x509_parse($pem);
if($ldap_cert_data == false) {
SimpleSAML\Logger::error('authX509: cert in '.
--
GitLab