tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Format/name changes

Browse source
This commit is contained in:
Philipp Holzer 2020-09-13 10:53:15 +02:00
parent 90346f61ba
commit 9d9489494e
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Util/Crypto.php
View file

@ -73,10 +73,11 @@ class Crypto
public static function meToPem($m, $e) public static function meToPem($m, $e)
{ {
$rsa = new RSA(); $rsa = new RSA();
$rsa->loadKey([ $rsa->loadKey(
'e' => new BigInteger($e, 256), [
'n' => new BigInteger($m, 256) 'e' => new BigInteger($e, 256),
]); 'n' => new BigInteger($m, 256)
]);
return $rsa->getPublicKey(); return $rsa->getPublicKey();
} }
@ -89,10 +90,10 @@ class Crypto
*/ */
public static function rsaToPem(string $key) public static function rsaToPem(string $key)
{ {
$publicKey = new RSA(); $rsa = new RSA();
$publicKey->setPublicKey($key); $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) public static function pemToMe(string $key, &$modulus, &$exponent)
{ {
$publicKey = new RSA(); $rsa = new RSA();
$publicKey->loadKey($key); $rsa->loadKey($key);
$publicKey->setPublicKey(); $rsa->setPublicKey();
$modulus = $publicKey->modulus->toBytes(); $modulus = $rsa->modulus->toBytes();
$exponent = $publicKey->exponent->toBytes(); $exponent = $rsa->exponent->toBytes();
} }
/** /**
@ -152,13 +153,13 @@ class Crypto
/** /**
* Encrypt a string with 'aes-256-cbc' cipher method. * Encrypt a string with 'aes-256-cbc' cipher method.
* *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
* *
* @param string $data * @param string $data
* @param string $key The key used for encryption. * @param string $key The key used for encryption.
* @param string $iv A non-NULL Initialization Vector. * @param string $iv A non-NULL Initialization Vector.
* *
* @return string|boolean Encrypted string or false on failure. * @return string|boolean Encrypted string or false on failure.
*/ */
private static function encryptAES256CBC($data, $key, $iv) private static function encryptAES256CBC($data, $key, $iv)
@ -168,13 +169,13 @@ class Crypto
/** /**
* Decrypt a string with 'aes-256-cbc' cipher method. * Decrypt a string with 'aes-256-cbc' cipher method.
* *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
* *
* @param string $data * @param string $data
* @param string $key The key used for decryption. * @param string $key The key used for decryption.
* @param string $iv A non-NULL Initialization Vector. * @param string $iv A non-NULL Initialization Vector.
* *
* @return string|boolean Decrypted string or false on failure. * @return string|boolean Decrypted string or false on failure.
*/ */
private static function decryptAES256CBC($data, $key, $iv) private static function decryptAES256CBC($data, $key, $iv)

9
tests/src/Util/CryptoTest.php
View file

@ -90,10 +90,11 @@ class CryptoTest extends TestCase
Crypto::pemToMe($key, $m, $e); Crypto::pemToMe($key, $m, $e);
$expectedRSA = new RSA(); $expectedRSA = new RSA();
$expectedRSA->loadKey([ $expectedRSA->loadKey(
'e' => new BigInteger($e, 256), [
'n' => new BigInteger($m, 256) 'e' => new BigInteger($e, 256),
]); 'n' => new BigInteger($m, 256)
]);
$this->assertEquals($expectedRSA->getPublicKey(), $key); $this->assertEquals($expectedRSA->getPublicKey(), $key);
} }