octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-05-29 06:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

for private key's, load works but loadFormat would be better

Browse Source
This commit is contained in:
terrafrost 2019-06-28 09:30:46 -05:00
parent eb659a5544
commit cb1e6b285c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ class PrivateKey extends DSA implements Common\PrivateKey
$key = $type::savePublicKey($this->p, $this->q, $this->g, $this->y);
return DSA::load($key, 'PKCS8')
return DSA::loadFormat('PKCS8', $key)
->withHash($this->hash->getHash())
->withSignatureFormat($this->shortFormat);
}

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

@ -196,7 +196,7 @@ class PrivateKey extends EC implements Common\PrivateKey
$type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
$key = $type::savePublicKey($this->curve, $this->QA);
$key = EC::load($key, 'PKCS8')
$key = EC::loadFormat('PKCS8', $key)
->withHash($this->hash->getHash())
->withSignatureFormat($this->shortFormat);
if ($this->curve instanceof TwistedEdwardsCurve) {

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

@ -503,7 +503,7 @@ class PrivateKey extends RSA implements Common\PrivateKey
}
$key = $type::savePublicKey($this->modulus, $this->publicExponent);
return RSA::load($key, 'PKCS8')
return RSA::loadFormat('PKCS8', $key)
->withHash($this->hash->getHash())
->withMGFHash($this->mgfHash->getHash())
->withSaltLength($this->sLen)