Project

General

Profile

« Previous | Next » 

Revision 1ec79365

Added by Jim Pingle almost 7 years ago

Certs: Fix CA subject assumptions. Fixes #8801

Several areas made assumptions about the number and order of CA subject
fields that were no longer correct after issue #8381 was corrected.

While here, also remove some outdated references to fields that are no
longer needed in related areas.

View differences:

src/usr/local/www/system_certmanager.php
1304 1304
					continue;
1305 1305
				}
1306 1306

  
1307
				$subject = cert_get_subject_array($ca['crt']);
1307
				$subject = cert_get_subject_hash($ca['crt']);
1308 1308
?>
1309 1309
				case "<?=$ca['refid'];?>":
1310
					$('#dn_country').val(<?=json_encode(cert_escape_x509_chars($subject[0]['v'], true));?>);
1311
					$('#dn_state').val(<?=json_encode(cert_escape_x509_chars($subject[1]['v'], true));?>);
1312
					$('#dn_city').val(<?=json_encode(cert_escape_x509_chars($subject[2]['v'], true));?>);
1313
					$('#dn_organization').val(<?=json_encode(cert_escape_x509_chars($subject[3]['v'], true));?>);
1314
					$('#dn_organizationalunit').val(<?=json_encode(cert_escape_x509_chars($subject[6]['v'], true));?>);
1310
					$('#dn_country').val(<?=json_encode(cert_escape_x509_chars($subject['C'], true));?>);
1311
					$('#dn_state').val(<?=json_encode(cert_escape_x509_chars($subject['ST'], true));?>);
1312
					$('#dn_city').val(<?=json_encode(cert_escape_x509_chars($subject['L'], true));?>);
1313
					$('#dn_organization').val(<?=json_encode(cert_escape_x509_chars($subject['O'], true));?>);
1314
					$('#dn_organizationalunit').val(<?=json_encode(cert_escape_x509_chars($subject['OU'], true));?>);
1315 1315
					break;
1316 1316
<?php
1317 1317
			endforeach;

Also available in: Unified diff