X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPublicRSAKey.php;h=7c46b63356c7e89e74090b02d36fd9b501b41934;hb=ae00111f5b6c5e20d94f0662a9cb02823b5df3c3;hp=f652811b54bd5a7b1d417d6359e4ff1eabf1848c;hpb=8c03bdada92845974ecadeecb9e673c7ffac22b4;p=friendica.git

diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php
index f652811b54..7c46b63356 100644
--- a/src/Module/PublicRSAKey.php
+++ b/src/Module/PublicRSAKey.php
@@ -1,11 +1,33 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
-use ASN_BASE;
 use Friendica\BaseModule;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Util\Crypto;
+use Friendica\Util\Strings;
+use phpseclib\File\ASN1;
 
 /**
  * prints the public RSA key of a user
@@ -14,7 +36,7 @@ class PublicRSAKey extends BaseModule
 {
 	public static function rawContent(array $parameters = [])
 	{
-		$app = self::getApp();
+		$app = DI::app();
 
 		// @TODO: Replace with parameter from router
 		if ($app->argc !== 2) {
@@ -29,18 +51,10 @@ class PublicRSAKey extends BaseModule
 			throw new BadRequestException();
 		}
 
-		$lines = explode("\n", $user['spubkey']);
-		unset($lines[0]);
-		unset($lines[count($lines)]);
-
-		$asnString = base64_decode(implode('', $lines));
-		$asnBase = ASN_BASE::parseASNString($asnString);
-
-		$m = $asnBase[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
-		$e = $asnBase[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
+		Crypto::pemToMe($user['spubkey'], $modulus, $exponent);
 
 		header('Content-type: application/magic-public-key');
-		echo 'RSA' . '.' . $m . '.' . $e;
+		echo 'RSA' . '.' . Strings::base64UrlEncode($modulus, true) . '.' . Strings::base64UrlEncode($exponent, true);
 
 		exit();
 	}