octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 19:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

set password in load methods for each pubkey instead of in loader

Browse Source
This commit is contained in:
terrafrost 2019-06-28 08:58:20 -05:00
parent 5573187f3d
commit eb659a5544
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpseclib/Crypt/Common/AsymmetricKey.php
View File

@ -171,7 +171,10 @@ abstract class AsymmetricKey
$components['format'] = $format; $components['format'] = $format;
return static::onLoad($components); $new = static::onLoad($components);
return $new instanceof PrivateKey ?
$new->withPassword($password) :
$new;
} }
/** /**
@ -199,7 +202,10 @@ abstract class AsymmetricKey
$components['format'] = $format; $components['format'] = $format;
return static::onLoad($components); $new = static::onLoad($components);
return $new instanceof PrivateKey ?
$new->withPassword($password) :
$new;
} }
/** /**

26
phpseclib/Crypt/PublicKeyLoader.php
View File

@ -39,26 +39,16 @@ abstract class PublicKeyLoader
public static function load($key, $password = false) public static function load($key, $password = false)
{ {
try { try {
$new = EC::load($key, $password); return EC::load($key, $password);
} catch (\Exception $e) {} } catch (NoKeyLoadedException $e) {}
if (!isset($new)) { try {
try { return RSA::load($key, $password);
$new = RSA::load($key, $password); } catch (NoKeyLoadedException $e) {}
} catch (\Exception $e) {}
}
if (!isset($new)) { try {
try { return DSA::load($key, $password);
$new = DSA::load($key, $password); } catch (NoKeyLoadedException $e) {}
} catch (\Exception $e) {}
}
if (isset($new)) {
return $new instanceof PrivateKey ?
$new->withPassword($password) :
$new;
}
try { try {
$x509 = new X509(); $x509 = new X509();