Format/name changes

diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 0ff911ba798115ceba2bd49ec5587fe121194fb5..55852d59ba58defc7fc644ae09db9ea2486eafc0 100644 (file)
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -73,10 +73,11 @@ class Crypto
        public static function meToPem($m, $e)
        {
                $rsa = new RSA();
-               $rsa->loadKey([
-                                                                 'e' => new BigInteger($e, 256),
-                                                                 'n' => new BigInteger($m, 256)
-                                                         ]);
+               $rsa->loadKey(
+                       [
+                               'e' => new BigInteger($e, 256),
+                               'n' => new BigInteger($m, 256)
+                       ]);
                return $rsa->getPublicKey();
        }
 
@@ -89,10 +90,10 @@ class Crypto
         */
        public static function rsaToPem(string $key)
        {
-               $publicKey = new RSA();
-               $publicKey->setPublicKey($key);
+               $rsa = new RSA();
+               $rsa->setPublicKey($key);
 
-               return $publicKey->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
+               return $rsa->getPublicKey(RSA::PUBLIC_FORMAT_PKCS8);
        }
 
        /**
@@ -106,12 +107,12 @@ class Crypto
         */
        public static function pemToMe(string $key, &$modulus, &$exponent)
        {
-               $publicKey = new RSA();
-               $publicKey->loadKey($key);
-               $publicKey->setPublicKey();
+               $rsa = new RSA();
+               $rsa->loadKey($key);
+               $rsa->setPublicKey();
 
-               $modulus  = $publicKey->modulus->toBytes();
-               $exponent = $publicKey->exponent->toBytes();
+               $modulus  = $rsa->modulus->toBytes();
+               $exponent = $rsa->exponent->toBytes();
        }
 
        /**
@@ -152,13 +153,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)
@@ -168,13 +169,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)

diff --git a/tests/src/Util/CryptoTest.php b/tests/src/Util/CryptoTest.php
index 73b3d5372e5a6dbb6435016aaf0e29da2772c6a4..c6c17bdcc2ce4062bb7e5988210f321bae21796b 100644 (file)
--- a/tests/src/Util/CryptoTest.php
+++ b/tests/src/Util/CryptoTest.php
@@ -90,10 +90,11 @@ class CryptoTest extends TestCase
                Crypto::pemToMe($key, $m, $e);
 
                $expectedRSA = new RSA();
-               $expectedRSA->loadKey([
-                                                                 'e' => new BigInteger($e, 256),
-                                                                 'n' => new BigInteger($m, 256)
-                                                         ]);
+               $expectedRSA->loadKey(
+                       [
+                               'e' => new BigInteger($e, 256),
+                               'n' => new BigInteger($m, 256)
+                       ]);
 
                $this->assertEquals($expectedRSA->getPublicKey(), $key);
        }