diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-06-13 09:25:45 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-06-13 09:25:45 -0300 |
commit | c352b9d149a96538097c65fc5d58aa587b661e6e (patch) | |
tree | 9de5393db96ce27280e724c8247e0529c45ee5aa | |
parent | 6f3d20631db477f0ea8c86baae71e9071b45da7d (diff) | |
parent | 2a08b81457f00d7502dd781ca623990a9f22f26e (diff) | |
download | pfsense-c352b9d149a96538097c65fc5d58aa587b661e6e.zip pfsense-c352b9d149a96538097c65fc5d58aa587b661e6e.tar.gz |
Merge pull request #1034 from vsquared56/master
-rw-r--r-- | etc/inc/certs.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc index 518bc59..a1397b8 100644 --- a/etc/inc/certs.inc +++ b/etc/inc/certs.inc @@ -449,10 +449,16 @@ function cert_get_issuer($str_crt, $decode = true) { ksort($components); foreach ($components as $a => $v) { - if (!strlen($issuer)) - $issuer = "{$a}={$v}"; - else - $issuer = "{$a}={$v}, {$issuer}"; + if (is_array($v)) { + ksort($v); + foreach ($v as $w) { + $aissuer = "{$a}={$w}"; + $issuer = (strlen($issuer)) ? "{$aissuer}, {$issuer}" : $aissuer; + } + } else { + $aissuer = "{$a}={$v}"; + $issuer = (strlen($issuer)) ? "{$aissuer}, {$issuer}" : $aissuer; + } } return $issuer; |