summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryakatz <yehuda@ymkatz.net>2011-04-18 15:18:01 -0400
committeryakatz <yehuda@ymkatz.net>2011-04-18 15:18:01 -0400
commite2e934e0c976bae835b58de7c2595666ad59d2a0 (patch)
treeb3f9c96c664c7417a033c6566bb53ca4b34ac4aa
parent359f6307d65e0a5d662445c7637e03057217eb1c (diff)
downloadpfsense-e2e934e0c976bae835b58de7c2595666ad59d2a0.zip
pfsense-e2e934e0c976bae835b58de7c2595666ad59d2a0.tar.gz
override option for certificate subject mismatch
-rw-r--r--usr/local/www/system_certmanager.php16
1 files changed, 14 insertions, 2 deletions
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index 0113461..7ab59fd 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -284,8 +284,12 @@ if ($_POST) {
$subj_csr = csr_get_subject($pconfig['csr'], false);
$subj_cert = cert_get_subject($pconfig['cert'], false);
- if (strcmp($subj_csr,$subj_cert))
- $input_errors[] = sprintf(gettext("The certificate subject '%s' does not match the signing request subject."),$subj_cert);
+ if ( !isset($_POST['ignoresubjectmismatch']) && !($_POST['ignoresubjectmismatch'] == "yes") ) {
+ if (strcmp($subj_csr,$subj_cert)) {
+ $input_errors[] = sprintf(gettext("The certificate subject '%s' does not match the signing request subject."),$subj_cert);
+ $subject_mismatch = true;
+ }
+ }
/* if this is an AJAX caller then handle via JSON */
if (isAjax() && is_array($input_errors)) {
@@ -776,6 +780,14 @@ function internalca_change() {
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
+ <?php if ( isset($subject_mismatch) && $subject_mismatch === true): ?>
+ <input id="ignoresubjectmismatch" name="ignoresubjectmismatch" type="checkbox" class="formbtn" value="yes" />
+ <label for="ignoresubjectmismatch"><strong><?=gettext("Ignore certificate subject mismatch"); ?></strong></label><br />
+ <?php echo gettext("Warning: Using this option may create an " .
+ "invalid certificate. Check this box to disable the request -> " .
+ "response subject verification. ");
+ ?><br/>
+ <?php endif;?>
<input id="submit" name="save" type="submit" class="formbtn" value="<?=gettext("Update");?>" />
<?php if (isset($id) && $a_cert[$id]): ?>
<input name="id" type="hidden" value="<?=$id;?>" />
OpenPOWER on IntegriCloud