pleroma

commit: b06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932
parent: d386e8a8253aecbd7a8f951f4624cc4943280125
Author: lambda <pleromagit@rogerbraun.net>
Date:   Thu, 12 Jul 2018 05:54:14 +0000

Merge branch 'bugfix/x509-public-key' into 'develop'

activitypub: switch to using x509 representation for public keys instead of pkcs#1

See merge request pleroma/pleroma!248
Diffstat:
M
lib/pleroma/web/activity_pub/views/user_view.ex
2
+-
M
test/web/activity_pub/views/user_view_test.exs
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.ActivityPub.UserView do
   def render("user.json", %{user: user}) do
     {:ok, user} = WebFinger.ensure_keys_present(user)
     {:ok, _, public_key} = Salmon.keys_from_pem(user.info["keys"])
-    public_key = :public_key.pem_entry_encode(:RSAPublicKey, public_key)
+    public_key = :public_key.pem_entry_encode(:SubjectPublicKeyInfo, public_key)
     public_key = :public_key.pem_encode([public_key])
 
     %{
diff --git a/test/web/activity_pub/views/user_view_test.exs b/test/web/activity_pub/views/user_view_test.exs
@@ -13,6 +13,6 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do
     assert result["id"] == user.ap_id
     assert result["preferredUsername"] == user.nickname
 
-    assert String.contains?(result["publicKey"]["publicKeyPem"], "BEGIN RSA PUBLIC KEY")
+    assert String.contains?(result["publicKey"]["publicKeyPem"], "BEGIN PUBLIC KEY")
   end
 end