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

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2021-02-12 07:48:49 -06:00
commit 76869c6d8f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) {

4
phpseclib/Crypt/PublicKeyLoader.php
View File

@ -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) {