mirror of
https://github.com/danog/phpseclib.git
synced 2025-01-22 13:01:59 +01:00
Merge branch '3.0'
This commit is contained in:
commit
5536318563
@ -47,7 +47,7 @@ class PrivateKey extends DH
|
||||
* Returns the public key
|
||||
*
|
||||
* @access public
|
||||
* @return DH
|
||||
* @return DH\PublicKey
|
||||
*/
|
||||
public function getPublicKey()
|
||||
{
|
||||
|
@ -673,7 +673,8 @@ class X509
|
||||
foreach ($this->extensionValues as $id => $value) {
|
||||
$root['tbsCertificate']['extensions'][] = [
|
||||
'extnId' => $id,
|
||||
'extnValue' => $value,
|
||||
'extnValue' => $value[1],
|
||||
'critical' => $value[0],
|
||||
];
|
||||
}
|
||||
|
||||
@ -4079,9 +4080,10 @@ class X509
|
||||
*
|
||||
* @param string $id
|
||||
* @param mixed $value
|
||||
* @param bool $critical
|
||||
*/
|
||||
public function setExtensionValue($id, $value)
|
||||
public function setExtensionValue($id, $value, $critical = false)
|
||||
{
|
||||
$this->extensionValues[$id] = $value;
|
||||
$this->extensionValues[$id] = [$critical, $value];
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user