From 8c0131cad957a383dbda72bfa9bef0c068733049 Mon Sep 17 00:00:00 2001
From: Lasse Birnbaum Jensen <lasse@sdu.dk>
Date: Thu, 4 Dec 2008 14:51:08 +0000
Subject: [PATCH] Changed regex to be able to use certificates with different
file encodings.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1053 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Utilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 0cefb473b..17e4dce4a 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -1451,7 +1451,7 @@ class SimpleSAML_Utilities {
$ret['PEM'] = $data;
/* Extract certificate data (if this is a certificate). */
- $pattern = '/^-----BEGIN CERTIFICATE-----$([^-]*)^-----END CERTIFICATE-----$/m';
+ $pattern = '/^-----BEGIN CERTIFICATE-----([^-]*)^-----END CERTIFICATE-----/m';
if (preg_match($pattern, $data, $matches)) {
/* We have a certificate. */
$ret['certData'] = str_replace(array("\r", "\n"), '', $matches[1]);
--
GitLab