diff --git a/phpseclib/Crypt/Common/AsymmetricKey.php b/phpseclib/Crypt/Common/AsymmetricKey.php index 8c2d520c..b78c9d5c 100644 --- a/phpseclib/Crypt/Common/AsymmetricKey.php +++ b/phpseclib/Crypt/Common/AsymmetricKey.php @@ -188,7 +188,7 @@ abstract class AsymmetricKey * @param string|array $key * @param string $password optional */ - public function loadPrivate($key, $password = '') + public function loadPrivateKey($key, $password = '') { $key = self::load($key, $password); if (!$key instanceof PrivateKey) { @@ -204,7 +204,7 @@ abstract class AsymmetricKey * @access public * @param string|array $key */ - public function loadPublic($key) + public function loadPublicKey($key) { $key = self::load($key); if (!$key instanceof PublicKey) { @@ -270,7 +270,7 @@ abstract class AsymmetricKey * @param string $key * @param string $password optional */ - public function loadPrivateFormat($type, $key, $password = false) + public function loadPrivateKeyFormat($type, $key, $password = false) { $key = self::loadFormat($type, $key, $password); if (!$key instanceof PrivateKey) { @@ -287,7 +287,7 @@ abstract class AsymmetricKey * @param string $type * @param string $key */ - public function loadPublicFormat($type, $key) + public function loadPublicKeyFormat($type, $key) { $key = self::loadFormat($type, $key); if (!$key instanceof PublicKey) { diff --git a/phpseclib/Crypt/PublicKeyLoader.php b/phpseclib/Crypt/PublicKeyLoader.php index 33fb3b89..a63565cd 100644 --- a/phpseclib/Crypt/PublicKeyLoader.php +++ b/phpseclib/Crypt/PublicKeyLoader.php @@ -72,7 +72,7 @@ abstract class PublicKeyLoader * @param string|array $key * @param string $password optional */ - public function loadPrivate($key, $password = false) + public 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 loadPublic($key) + public function loadPublicKey($key) { $key = self::load($key); if (!$key instanceof PublicKey) {