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

Merge pull request #23 from monnerat/newattrs

Browse Source 
X509: handle multiple-valued attributes in setDNProp(). Fix setDN().
This commit is contained in:
terrafrost 2012-10-06 08:16:15 -07:00
commit ec067c1f14
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpseclib/File/X509.php
View File

@ -1825,7 +1825,7 @@ class File_X509 {
* Set a Distinguished Name property * Set a Distinguished Name property
* *
* @param String $propName * @param String $propName
* @param String $propValue * @param Mixed $propValue
* @access public * @access public
* @return Boolean * @return Boolean
*/ */
@ -1839,12 +1839,13 @@ class File_X509 {
return false; return false;
} }
$this->dn['rdnSequence'][] = array( foreach ((array) $propValue as $v)
array( $this->dn['rdnSequence'][] = array(
'type' => $propName, array(
'value'=> $propValue 'type' => $propName,
) 'value'=> $v
); )
);
return true; return true;
} }
@ -1912,14 +1913,18 @@ class File_X509 {
* Set a Distinguished Name * Set a Distinguished Name
* *
* @param Mixed $dn * @param Mixed $dn
* @param Boolean $merge optional
* @access public * @access public
* @return Boolean * @return Boolean
*/ */
function setDN($dn) function setDN($dn, $merge = false)
{ {
if (!$merge)
$this->dn = NULL;
if (is_array($dn)) { if (is_array($dn)) {
if (isset($dn['rdnSequence'])) { if (isset($dn['rdnSequence'])) {
$this->dn = $dn; $this->dn = $dn; // No merge here.
return true; return true;
} }