Project

General

Profile

« Previous | Next » 

Revision 7db12011

Added by Jim Pingle almost 8 years ago

Add another possible CSR Armor string when validating. Ticket #7383

View differences:

src/usr/local/www/system_certmanager.php
215 215
				gettext("Descriptive name"),
216 216
				gettext("CA to sign with"));
217 217

  
218
			if (($_POST['csrtosign'] === "new") && (!strstr($_POST['csrpaste'], "BEGIN CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END CERTIFICATE REQUEST"))) {
218
			if (($_POST['csrtosign'] === "new") &&
219
			    ((!strstr($_POST['csrpaste'], "BEGIN CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END CERTIFICATE REQUEST")) &&
220
			    (!strstr($_POST['csrpaste'], "BEGIN NEW CERTIFICATE REQUEST") || !strstr($_POST['csrpaste'], "END NEW CERTIFICATE REQUEST")))) {
219 221
				$input_errors[] = gettext("This signing request does not appear to be valid.");
220 222
			}
221 223

  

Also available in: Unified diff