danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-11-27 12:44:38 +01:00
Code Issues Projects Releases Wiki Activity

X509: handle multiple-valued attributes in setDNProp(). Fix setDN().

Browse Source
This commit is contained in:
Patrick Monnerat 2012-10-01 12:35:43 +02:00
parent 45512c7a50
commit f4b03722fd
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
*
* @param String $propName
* @param String $propValue
* @param Mixed $propValue
* @access public
* @return Boolean
*/
@ -1839,12 +1839,13 @@ class File_X509 {
return false;
}
$this->dn['rdnSequence'][] = array(
array(
'type' => $propName,
'value'=> $propValue
)
);
foreach ((array) $propValue as $v)
$this->dn['rdnSequence'][] = array(
array(
'type' => $propName,
'value'=> $v
)
);
return true;
}
@ -1912,14 +1913,18 @@ class File_X509 {
* Set a Distinguished Name
*
* @param Mixed $dn
* @param Boolean $merge optional
* @access public
* @return Boolean
*/
function setDN($dn)
function setDN($dn, $merge = false)
{
if (!$merge)
$this->dn = NULL;
if (is_array($dn)) {
if (isset($dn['rdnSequence'])) {
$this->dn = $dn;
$this->dn = $dn; // No merge here.
return true;
}