From 623a7eee5740f7c352d3b569755a6b3828d8699c Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 14:46:17 +0200 Subject: [PATCH] Diaspora seeds tend to give the key type in 'type' attribute --- plugins/Diaspora/DiasporaPlugin.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Diaspora/DiasporaPlugin.php b/plugins/Diaspora/DiasporaPlugin.php index 1490fce7a3..ae5fb2f73a 100644 --- a/plugins/Diaspora/DiasporaPlugin.php +++ b/plugins/Diaspora/DiasporaPlugin.php @@ -38,8 +38,11 @@ class DiasporaPlugin extends Plugin public function onEndAttachPubkeyToUserXRD(Magicsig $magicsig, XML_XRD $xrd, Profile $target) { + // So far we've only handled RSA keys, but it can change in the future, + // so be prepared. And remember to change the statically assigned type attribute below! + assert($magicsig->publicKey instanceof Crypt_RSA); $xrd->links[] = new XML_XRD_Element_Link(self::REL_PUBLIC_KEY, - base64_encode($magicsig->exportPublicKey())); + base64_encode($magicsig->exportPublicKey()), 'RSA'); } public function onPluginVersion(array &$versions)