lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: unify code to extract issuer/subject

Browse Source 
The code was adding an extra ", " at the end.
This commit is contained in:
Franco Fichtner 2021-01-05 15:31:33 +01:00
parent 444b8f405e
commit f8844af85d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/etc/inc/certs.inc
View File

@ -344,11 +344,7 @@ function csr_get_subject($str_crt, $decode = true)
ksort($components);
foreach ($components as $a => $v) {
if (!strlen($subject)) {
$subject = "{$a}={$v}";
} else {
$subject = "{$a}={$v}, {$subject}";
}
$subject = strlen($subject) ? "{$a}={$v}, {$subject}" : "{$a}={$v}";
}
return $subject;
@ -373,12 +369,10 @@ function cert_get_subject($str_crt, $decode = true)
if (is_array($v)) {
ksort($v);
foreach ($v as $w) {
$asubject = "{$a}={$w}";
$subject = (isset($subject)) ? "{$asubject}, {$subject}" : $asubject;
$subject = strlen($subject) ? "{$a}={$w}, {$subject}" : "{$a}={$w}";
}
} else {
$asubject = "{$a}={$v}";
$subject = (isset($subject)) ? "{$asubject}, {$subject}" : $asubject;
$subject = strlen($subject) ? "{$a}={$v}, {$subject}" : "{$a}={$v}";
}
}
@ -423,11 +417,11 @@ function cert_get_issuer($str_crt, $decode = true)
ksort($v);
foreach ($v as $w) {
$aissuer = "{$a}={$w}";
$issuer = (isset($issuer)) ? "{$aissuer}, {$issuer}" : $aissuer;
$issuer = strlen($issuer) ? "{$aissuer}, {$issuer}" : $aissuer;
}
} else {
$aissuer = "{$a}={$v}";
$issuer = (isset($issuer)) ? "{$aissuer}, {$issuer}" : $aissuer;
$issuer = strlen($issuer) ? "{$aissuer}, {$issuer}" : $aissuer;
}
}