octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2021-08-14 13:26:59 -05:00
commit d274ef8d48
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ abstract class AsymmetricKey
* @param string|array $key * @param string|array $key
* @param string $password optional * @param string $password optional
*/ */
public function loadPrivateKey($key, $password = '') public static function loadPrivateKey($key, $password = '')
{ {
$key = self::load($key, $password); $key = self::load($key, $password);
if (!$key instanceof PrivateKey) { if (!$key instanceof PrivateKey) {
@ -214,7 +214,7 @@ abstract class AsymmetricKey
* @access public * @access public
* @param string|array $key * @param string|array $key
*/ */
public function loadPublicKey($key) public static function loadPublicKey($key)
{ {
$key = self::load($key); $key = self::load($key);
if (!$key instanceof PublicKey) { if (!$key instanceof PublicKey) {
@ -230,7 +230,7 @@ abstract class AsymmetricKey
* @access public * @access public
* @param string|array $key * @param string|array $key
*/ */
public function loadParameters($key) public static function loadParameters($key)
{ {
$key = self::load($key); $key = self::load($key);
if (!$key instanceof PrivateKey && !$key instanceof PublicKey) { if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {

6
phpseclib/Crypt/PublicKeyLoader.php
View File

@ -72,7 +72,7 @@ abstract class PublicKeyLoader
* @param string|array $key * @param string|array $key
* @param string $password optional * @param string $password optional
*/ */
public function loadPrivateKey($key, $password = false) public static function loadPrivateKey($key, $password = false)
{ {
$key = self::load($key, $password); $key = self::load($key, $password);
if (!$key instanceof PrivateKey) { if (!$key instanceof PrivateKey) {
@ -88,7 +88,7 @@ abstract class PublicKeyLoader
* @access public * @access public
* @param string|array $key * @param string|array $key
*/ */
public function loadPublicKey($key) public static function loadPublicKey($key)
{ {
$key = self::load($key); $key = self::load($key);
if (!$key instanceof PublicKey) { if (!$key instanceof PublicKey) {
@ -104,7 +104,7 @@ abstract class PublicKeyLoader
* @access public * @access public
* @param string|array $key * @param string|array $key
*/ */
public function loadParameters($key) public static function loadParameters($key)
{ {
$key = self::load($key); $key = self::load($key);
if (!$key instanceof PrivateKey && !$key instanceof PublicKey) { if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {