From aaadabf7d217b6ff3ae3510460751ff7ce708cb4 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 14 Aug 2012 02:20:48 -0700
Subject: [PATCH] partial fix for D* public key format change

---
 include/Scrape.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/Scrape.php b/include/Scrape.php
index b784650cd1..85c6367889 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -394,7 +394,10 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 				}
 				if($link['@attributes']['rel'] === 'diaspora-public-key') {
 					$diaspora_key = base64_decode(unamp($link['@attributes']['href']));
-					$pubkey = rsatopem($diaspora_key);
+					if(strstr($diaspora_key,'RSA '))
+						$pubkey = rsatopem($diaspora_key);
+					else
+						$pubkey = $diaspora_key;
 					$diaspora = true;
 				}
 			}