danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-14 18:15:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2021-05-22 10:23:48 -05:00
commit 5cc95a591d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpseclib/Crypt/Common/PrivateKey.php
View File

@ -26,5 +26,5 @@ interface PrivateKey
//public function decrypt($ciphertext); //public function decrypt($ciphertext);
public function getPublicKey(); public function getPublicKey();
public function toString($type, array $options = []); public function toString($type, array $options = []);
public function withPassword($string); public function withPassword($string = false);
} }

2
phpseclib/File/X509.php
View File

@ -2615,7 +2615,7 @@ class X509
if ($signatureAlgorithm != 'id-RSASSA-PSS') { if ($signatureAlgorithm != 'id-RSASSA-PSS') {
$signatureAlgorithm = ['algorithm' => $signatureAlgorithm]; $signatureAlgorithm = ['algorithm' => $signatureAlgorithm];
} else { } else {
$r = PSS::load($issuer->privateKey->toString('PSS')); $r = PSS::load($issuer->privateKey->withPassword()->toString('PSS'));
$signatureAlgorithm = [ $signatureAlgorithm = [
'algorithm' => 'id-RSASSA-PSS', 'algorithm' => 'id-RSASSA-PSS',
'parameters' => PSS::savePSSParams($r) 'parameters' => PSS::savePSSParams($r)