diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:54:14 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:54:14 +0000 |
| commit | b06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932 (patch) | |
| tree | 16d08abe6e4a762cbd61177465be48361296d081 /lib | |
| parent | d386e8a8253aecbd7a8f951f4624cc4943280125 (diff) | |
| parent | 85465512578d8113366e71d9122d336b8fd49fa4 (diff) | |
| download | pleroma-b06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932.tar.gz | |
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 (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/views/user_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex index f4b2e0610..41bfe5048 100644 --- 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]) %{ |