octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-14 01:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

X509: make it so ip addresses and domain names can be used together

Browse Source
This commit is contained in:
terrafrost 2013-10-09 14:51:34 -05:00
parent 9b53c45f04
commit a577a09a4f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpseclib/File/X509.php
View File

@ -3228,9 +3228,10 @@ class File_X509 {
$this->setExtension('id-ce-subjectKeyIdentifier', $subject->currentKeyIdentifier); $this->setExtension('id-ce-subjectKeyIdentifier', $subject->currentKeyIdentifier);
} }
$altName = array();
if (isset($subject->domains) && count($subject->domains) > 1) { if (isset($subject->domains) && count($subject->domains) > 1) {
$this->setExtension('id-ce-subjectAltName', $altName = array_map(array('File_X509', '_dnsName'), $subject->domains);
array_map(array('File_X509', '_dnsName'), $subject->domains));
} }
if (isset($subject->ipAddresses) && count($subject->ipAddresses)) { if (isset($subject->ipAddresses) && count($subject->ipAddresses)) {
@ -3244,10 +3245,14 @@ class File_X509 {
} }
} }
if (count($ipAddresses)) { if (count($ipAddresses)) {
$this->setExtension('id-ce-subjectAltName', $ipAddresses); $altName = array_merge($altName, $ipAddresses);
} }
} }
if (!empty($altName)) {
$this->setExtension('id-ce-subjectAltName', $altName);
}
if ($this->caFlag) { if ($this->caFlag) {
$keyUsage = $this->getExtension('id-ce-keyUsage'); $keyUsage = $this->getExtension('id-ce-keyUsage');
if (!$keyUsage) { if (!$keyUsage) {