From dd2387c570e0f2c53a0aeecfedafef029590bc8b Mon Sep 17 00:00:00 2001 From: alech Date: Wed, 24 Sep 2008 09:24:43 +0000 Subject: [PATCH] PKCS#10 validator: allow 'BEGIN NEW CERTIFICATE REQUEST' syntax as well (used by IIS, for example) ... git-svn-id: https://openxpki.svn.sourceforge.net/svnroot/openxpki@1355 95d9436f-6502-0410-902c-bd9569d1a17e --- .../core/trunk/OpenXPKI/Server/Workflow/Validator/PKCS10.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/perl-modules/core/trunk/OpenXPKI/Server/Workflow/Validator/PKCS10.pm b/trunk/perl-modules/core/trunk/OpenXPKI/Server/Workflow/Validator/PKCS10.pm index aee91482..d31bc4f3 100644 --- a/trunk/perl-modules/core/trunk/OpenXPKI/Server/Workflow/Validator/PKCS10.pm +++ b/trunk/perl-modules/core/trunk/OpenXPKI/Server/Workflow/Validator/PKCS10.pm @@ -26,12 +26,12 @@ sub validate { } ## check that it is clean - if ($pkcs10 !~ m{^-----BEGIN \s CERTIFICATE \s REQUEST-----\s+ + if ($pkcs10 !~ m{^-----BEGIN \s (NEW)? \s? CERTIFICATE \s REQUEST-----\s+ ([0-9A-Za-z\-_=]+\s+)+ - -----END \s CERTIFICATE \s REQUEST-----\s*}xs and ## RFC 3548 URL and filename safe - $pkcs10 !~ m{^-----BEGIN \s CERTIFICATE \s REQUEST-----\s+ + -----END \s (NEW)? \s? CERTIFICATE \s REQUEST-----\s*}xs and ## RFC 3548 URL and filename safe + $pkcs10 !~ m{^-----BEGIN \s (NEW)? \s? CERTIFICATE \s REQUEST-----\s+ ([0-9A-Za-z+\/=]+\s+)+ - -----END \s CERTIFICATE \s REQUEST-----\s*}xs ## RFC 1421,2045 and 3548 + -----END \s (NEW)? \s? CERTIFICATE \s REQUEST-----\s*}xs ## RFC 1421,2045 and 3548 ) { ## PKCS#10 is base64 with some header and footer -- 2.11.4.GIT