danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-03 10:08:04 +01:00
Code Issues Projects Releases Wiki Activity

PKCS8: fix private key creation

Browse Source
This commit is contained in:
terrafrost 2022-02-14 18:54:45 -06:00
parent f5858a6a1d
commit dc488f967f
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/Formats/Keys/PKCS8.php
View File

@ -141,7 +141,7 @@ abstract class PKCS8 extends Progenitor
$params = ASN1::encodeDER($params, Maps\DSAParams::MAP); $params = ASN1::encodeDER($params, Maps\DSAParams::MAP);
$params = new ASN1\Element($params); $params = new ASN1\Element($params);
$key = ASN1::encodeDER($x, Maps\DSAPublicKey::MAP); $key = ASN1::encodeDER($x, Maps\DSAPublicKey::MAP);
return self::wrapPrivateKey($key, [], $params, $password, $options); return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
} }
/** /**

2
phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
View File

@ -128,7 +128,7 @@ abstract class PKCS8 extends Progenitor
{ {
$key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients); $key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients);
$key = ASN1::extractBER($key); $key = ASN1::extractBER($key);
return self::wrapPrivateKey($key, [], null, $password, $options); return self::wrapPrivateKey($key, [], null, $password, null, '', $options);
} }
/** /**

2
phpseclib/Crypt/RSA/Formats/Keys/PSS.php
View File

@ -181,7 +181,7 @@ abstract class PSS extends Progenitor
$key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients); $key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients);
$key = ASN1::extractBER($key); $key = ASN1::extractBER($key);
$params = self::savePSSParams($options); $params = self::savePSSParams($options);
return self::wrapPrivateKey($key, [], $params, $password, $options); return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
} }
/** /**