X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FSalmon.php;h=2bf86f0e36317714ccfbc110de9efc0d0809207e;hb=44a2ec439eac3b5b271ddeb02dbd5e905fca3486;hp=d26a3229d11433e8d98df245b3174fd7d2f560b4;hpb=2ca03acb459cf3147579d37d516cd39bb3b493e3;p=friendica.git

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index d26a3229d1..2bf86f0e36 100644
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -5,10 +5,9 @@
 namespace Friendica\Protocol;
 
 use Friendica\Network\Probe;
+use Friendica\Util\Crypto;
 use Friendica\Util\XML;
 
-require_once 'include/crypto.php';
-
 /**
  * @brief Salmon Protocol class
  * The Salmon Protocol is a message exchange protocol running over HTTP designed to decentralize commentary
@@ -107,18 +106,18 @@ class Salmon
 		$data_type = 'application/atom+xml';
 		$encoding  = 'base64url';
 		$algorithm = 'RSA-SHA256';
-		$keyhash   = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true);
+		$keyhash   = base64url_encode(hash('sha256', self::salmonKey($owner['spubkey'])), true);
 
 		$precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm);
 
 		// GNU Social format
-		$signature   = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey']));
+		$signature   = base64url_encode(Crypto::rsaSign($data . $precomputed, $owner['sprvkey']));
 
 		// Compliant format
-		$signature2  = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey']));
+		$signature2  = base64url_encode(Crypto::rsaSign(str_replace('=', '', $data . $precomputed), $owner['sprvkey']));
 
 		// Old Status.net format
-		$signature3  = base64url_encode(rsa_sign($data, $owner['sprvkey']));
+		$signature3  = base64url_encode(Crypto::rsaSign($data, $owner['sprvkey']));
 
 		// At first try the non compliant method that works for GNU Social
 		$xmldata = array("me:env" => array("me:data" => $data,
@@ -201,4 +200,14 @@ class Salmon
 
 		return (($return_code >= 200) && ($return_code < 300)) ? 0 : 1;
 	}
+
+	/**
+	 * @param string $pubkey public key
+	 * @return string
+	 */
+	public static function salmonKey($pubkey)
+	{
+		Crypto::pemToMe($pubkey, $m, $e);
+		return 'RSA' . '.' . base64url_encode($m, true) . '.' . base64url_encode($e, true);
+	}
 }