bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki 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

19
src/Util/Crypto.php
View file

@ -73,7 +73,8 @@ 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), 'e' => new BigInteger($e, 256),
'n' => new BigInteger($m, 256) 'n' => new BigInteger($m, 256)
]); ]);
@ -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();
} }
/** /**

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

@ -90,7 +90,8 @@ 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), 'e' => new BigInteger($e, 256),
'n' => new BigInteger($m, 256) 'n' => new BigInteger($m, 256)
]); ]);