mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-15 17:57:12 +00:00
Merge branch '3.0'
This commit is contained in:
commit
d274ef8d48
@ -198,7 +198,7 @@ abstract class AsymmetricKey
|
||||
* @param string|array $key
|
||||
* @param string $password optional
|
||||
*/
|
||||
public function loadPrivateKey($key, $password = '')
|
||||
public static function loadPrivateKey($key, $password = '')
|
||||
{
|
||||
$key = self::load($key, $password);
|
||||
if (!$key instanceof PrivateKey) {
|
||||
@ -214,7 +214,7 @@ abstract class AsymmetricKey
|
||||
* @access public
|
||||
* @param string|array $key
|
||||
*/
|
||||
public function loadPublicKey($key)
|
||||
public static function loadPublicKey($key)
|
||||
{
|
||||
$key = self::load($key);
|
||||
if (!$key instanceof PublicKey) {
|
||||
@ -230,7 +230,7 @@ abstract class AsymmetricKey
|
||||
* @access public
|
||||
* @param string|array $key
|
||||
*/
|
||||
public function loadParameters($key)
|
||||
public static function loadParameters($key)
|
||||
{
|
||||
$key = self::load($key);
|
||||
if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
|
||||
|
@ -72,7 +72,7 @@ abstract class PublicKeyLoader
|
||||
* @param string|array $key
|
||||
* @param string $password optional
|
||||
*/
|
||||
public function loadPrivateKey($key, $password = false)
|
||||
public static function loadPrivateKey($key, $password = false)
|
||||
{
|
||||
$key = self::load($key, $password);
|
||||
if (!$key instanceof PrivateKey) {
|
||||
@ -88,7 +88,7 @@ abstract class PublicKeyLoader
|
||||
* @access public
|
||||
* @param string|array $key
|
||||
*/
|
||||
public function loadPublicKey($key)
|
||||
public static function loadPublicKey($key)
|
||||
{
|
||||
$key = self::load($key);
|
||||
if (!$key instanceof PublicKey) {
|
||||
@ -104,7 +104,7 @@ abstract class PublicKeyLoader
|
||||
* @access public
|
||||
* @param string|array $key
|
||||
*/
|
||||
public function loadParameters($key)
|
||||
public static function loadParameters($key)
|
||||
{
|
||||
$key = self::load($key);
|
||||
if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
|
||||
|
Loading…
Reference in New Issue
Block a user