Merge remote-tracking branch 'upstream/develop' into diaspora-item

[friendica.git] / src / Util / Crypto.php

diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index d983202c0c1847f149fc49ffa1a983702d9a4711..1781dfb77988a0389484bed24cea973effe19c05 100644 (file)
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,14 +21,11 @@
 
 namespace Friendica\Util;
 
-use Exception;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use phpseclib\Crypt\RSA;
-use phpseclib\Math\BigInteger;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 /**
  * Crypto class
@@ -66,22 +63,6 @@ class Crypto
                return openssl_verify($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
        }
 
-       /**
-       /**
-        * @param string $m modulo
-        * @param string $e exponent
-        * @return string
-        */
-       public static function meToPem($m, $e)
-       {
-               $rsa = new RSA();
-               $rsa->loadKey([
-                       'e' => new BigInteger($e, 256),
-                       'n' => new BigInteger($m, 256)
-               ]);
-               return $rsa->getPublicKey();
-       }
-
        /**
         * Transform RSA public keys to standard PEM output
         *
@@ -91,29 +72,7 @@ class Crypto
         */
        public static function rsaToPem(string $key)
        {
-               $rsa = new RSA();
-               $rsa->setPublicKey($key);
-
-               return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
-       }
-
-       /**
-        * Extracts the modulo and exponent reference from a public PEM key
-        *
-        * @param string $key      public PEM key
-        * @param string $modulus  (ref) modulo reference
-        * @param string $exponent (ref) exponent reference
-        *
-        * @return void
-        */
-       public static function pemToMe(string $key, &$modulus, &$exponent)
-       {
-               $rsa = new RSA();
-               $rsa->loadKey($key);
-               $rsa->setPublicKey();
-
-               $modulus  = $rsa->modulus->toBytes();
-               $exponent = $rsa->exponent->toBytes();
+               return (string)PublicKeyLoader::load($key);
        }
 
        /**
@@ -152,50 +111,6 @@ class Crypto
                return $response;
        }
 
-       /**
-        * Create a new elliptic curve key pair
-        *
-        * @return array with the elements "prvkey", "pubkey", "vapid-public" and "vapid-private"
-        */
-       public static function newECKeypair()
-       {
-               $openssl_options = [
-                       'curve_name'       => 'prime256v1',
-                       'private_key_type' => OPENSSL_KEYTYPE_EC
-               ];
-
-               $conf = DI::config()->get('system', 'openssl_conf_file');
-               if ($conf) {
-                       $openssl_options['config'] = $conf;
-               }
-               $result = openssl_pkey_new($openssl_options);
-
-               if (empty($result)) {
-                       throw new Exception('Key creation failed');
-               }
-
-               $response = ['prvkey' => '', 'pubkey' => ''];
-
-               // Get private key
-               openssl_pkey_export($result, $response['prvkey']);
-
-               // Get public key
-               $pkey = openssl_pkey_get_details($result);
-               $response['pubkey'] = $pkey['key'];
-
-               // Create VAPID keys
-               // @see https://github.com/web-push-libs/web-push-php/blob/256a18b2a2411469c94943725fb6eccb9681bd75/src/Utils.php#L60-L62
-               $hexString = '04';
-               $hexString .= str_pad(bin2hex($pkey['ec']['x']), 64, '0', STR_PAD_LEFT);
-               $hexString .= str_pad(bin2hex($pkey['ec']['y']), 64, '0', STR_PAD_LEFT);
-               $response['vapid-public'] = Base64UrlSafe::encode(hex2bin($hexString));
-
-               // @see https://github.com/web-push-libs/web-push-php/blob/256a18b2a2411469c94943725fb6eccb9681bd75/src/VAPID.php
-               $response['vapid-private'] = Base64UrlSafe::encode(hex2bin(str_pad(bin2hex($pkey['ec']['d']), 64, '0', STR_PAD_LEFT)));
-
-               return $response;
-       }
-
        /**
         * Encrypt a string with 'aes-256-cbc' cipher method.
         *