Apply suggestions from code review

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

diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index ab669823b5fabca2b38aa71f418dbcd045eb5389..1781dfb77988a0389484bed24cea973effe19c05 100644 (file)
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,12 +21,11 @@
 
 namespace Friendica\Util;
 
-use ASNValue;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
-use phpseclib\Crypt\RSA;
+use phpseclib3\Crypt\PublicKeyLoader;
 
 /**
  * Crypto class
@@ -64,69 +63,6 @@ class Crypto
                return openssl_verify($data, $sig, $key, (($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
        }
 
-       /**
-        * @param string $Der     der formatted string
-        * @param bool   $Private key type optional, default false
-        * @return string
-        */
-       private static function DerToPem($Der, $Private = false)
-       {
-               //Encode:
-               $Der = base64_encode($Der);
-               //Split lines:
-               $lines = str_split($Der, 65);
-               $body = implode("\n", $lines);
-               //Get title:
-               $title = $Private ? 'RSA PRIVATE KEY' : 'PUBLIC KEY';
-               //Add wrapping:
-               $result = "-----BEGIN {$title}-----\n";
-               $result .= $body . "\n";
-               $result .= "-----END {$title}-----\n";
-
-               return $result;
-       }
-
-       /**
-        * @param string $Modulus        modulo
-        * @param string $PublicExponent exponent
-        * @return string
-        */
-       private static function pkcs8Encode($Modulus, $PublicExponent)
-       {
-               //Encode key sequence
-               $modulus = new ASNValue(ASNValue::TAG_INTEGER);
-               $modulus->SetIntBuffer($Modulus);
-               $publicExponent = new ASNValue(ASNValue::TAG_INTEGER);
-               $publicExponent->SetIntBuffer($PublicExponent);
-               $keySequenceItems = [$modulus, $publicExponent];
-               $keySequence = new ASNValue(ASNValue::TAG_SEQUENCE);
-               $keySequence->SetSequence($keySequenceItems);
-               //Encode bit string
-               $bitStringValue = $keySequence->Encode();
-               $bitStringValue = chr(0x00) . $bitStringValue; //Add unused bits byte
-               $bitString = new ASNValue(ASNValue::TAG_BITSTRING);
-               $bitString->Value = $bitStringValue;
-               //Encode body
-               $bodyValue = "\x30\x0d\x06\x09\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01\x05\x00" . $bitString->Encode();
-               $body = new ASNValue(ASNValue::TAG_SEQUENCE);
-               $body->Value = $bodyValue;
-               //Get DER encoded public key:
-               $PublicDER = $body->Encode();
-               return $PublicDER;
-       }
-
-       /**
-        * @param string $m modulo
-        * @param string $e exponent
-        * @return string
-        */
-       public static function meToPem($m, $e)
-       {
-               $der = self::pkcs8Encode($m, $e);
-               $key = self::DerToPem($der, false);
-               return $key;
-       }
-
        /**
         * Transform RSA public keys to standard PEM output
         *
@@ -136,29 +72,7 @@ class Crypto
         */
        public static function rsaToPem(string $key)
        {
-               $publicKey = new RSA();
-               $publicKey->setPublicKey($key);
-
-               return $publicKey->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, string &$modulus, string &$exponent)
-       {
-               $publicKey = new RSA();
-               $publicKey->loadKey($key);
-               $publicKey->setPublicKey();
-
-               $modulus  = $publicKey->modulus->toBytes();
-               $exponent = $publicKey->exponent->toBytes();
+               return (string)PublicKeyLoader::load($key);
        }
 
        /**
@@ -181,7 +95,7 @@ class Crypto
                $result = openssl_pkey_new($openssl_options);
 
                if (empty($result)) {
-                       Logger::log('new_keypair: failed');
+                       Logger::notice('new_keypair: failed');
                        return false;
                }
 
@@ -199,13 +113,13 @@ class Crypto
 
        /**
         * Encrypt a string with 'aes-256-cbc' cipher method.
-        * 
+        *
         * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
-        * 
+        *
         * @param string $data
         * @param string $key   The key used for encryption.
         * @param string $iv    A non-NULL Initialization Vector.
-        * 
+        *
         * @return string|boolean Encrypted string or false on failure.
         */
        private static function encryptAES256CBC($data, $key, $iv)
@@ -215,13 +129,13 @@ class Crypto
 
        /**
         * Decrypt a string with 'aes-256-cbc' cipher method.
-        * 
+        *
         * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
-        * 
+        *
         * @param string $data
         * @param string $key   The key used for decryption.
         * @param string $iv    A non-NULL Initialization Vector.
-        * 
+        *
         * @return string|boolean Decrypted string or false on failure.
         */
        private static function decryptAES256CBC($data, $key, $iv)
@@ -262,7 +176,7 @@ class Crypto
        private static function encapsulateOther($data, $pubkey, $alg)
        {
                if (!$pubkey) {
-                       Logger::log('no key. data: '.$data);
+                       Logger::notice('no key. data: '.$data);
                }
                $fn = 'encrypt' . strtoupper($alg);
                if (method_exists(__CLASS__, $fn)) {
@@ -304,7 +218,7 @@ class Crypto
        private static function encapsulateAes($data, $pubkey)
        {
                if (!$pubkey) {
-                       Logger::log('aes_encapsulate: no key. data: ' . $data);
+                       Logger::notice('aes_encapsulate: no key. data: ' . $data);
                }
 
                $key = random_bytes(32);
@@ -315,7 +229,7 @@ class Crypto
                // log the offending call so we can track it down
                if (!openssl_public_encrypt($key, $k, $pubkey)) {
                        $x = debug_backtrace();
-                       Logger::log('aes_encapsulate: RSA failed. ' . print_r($x[0], true));
+                       Logger::notice('aes_encapsulate: RSA failed.', ['data' => $x[0]]);
                }
 
                $result['alg'] = 'aes256cbc';