1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 02:17:04 +01:00

Merge branch '3.0'

This commit is contained in:
terrafrost 2020-04-08 06:16:10 -05:00
commit bc3374a2c1

View File

@ -206,6 +206,7 @@ abstract class AsymmetricKey
$components['format'] = $format; $components['format'] = $format;
$new = static::onLoad($components); $new = static::onLoad($components);
$new->format = $format;
return $new instanceof PrivateKey ? return $new instanceof PrivateKey ?
$new->withPassword($password) : $new->withPassword($password) :
$new; $new;