From 401c2b88b3c9e3b672e96aed399c72f8d2191b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 19 Dec 2008 11:59:32 +0000
Subject: [PATCH] Remove spaces etc from certificate field in metadata

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1069 44740490-163a-0410-bde0-09ae8108e29a
---
 lib/SimpleSAML/Metadata/SAMLParser.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 6b2031f4d..57da69588 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -458,7 +458,7 @@ class SimpleSAML_Metadata_SAMLParser {
 				continue;
 			}
 
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			break;
 		}
 
@@ -527,7 +527,7 @@ class SimpleSAML_Metadata_SAMLParser {
 			}
 
 			/* Add the certificate data to the metadata. Only the first certificate will be added. */
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			$ret['certFingerprint'][] = sha1($certData);
 			break;
 		}
@@ -612,7 +612,7 @@ class SimpleSAML_Metadata_SAMLParser {
 				continue;
 			}
 
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			break;
 		}
 
@@ -705,7 +705,7 @@ class SimpleSAML_Metadata_SAMLParser {
 			}
 
 			/* Add the certificate data to the metadata. Only the first certificate will be added. */
-			$ret['certData'] = str_replace(array("\r", "\n"), '', $key['X509Certificate']);
+			$ret['certData'] = preg_replace('/\s+/', '', str_replace(array("\r", "\n"), '', $key['X509Certificate']));
 			$ret['certFingerprint'][] = sha1($certData);
 			break;
 		}
-- 
GitLab