aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-30 01:03:24 -0700
committerFriendika <info@friendika.com>2011-07-30 01:03:24 -0700
commit60caffcd7776043ee89e5939b81d7bd9d948cd4e (patch)
tree14765e1b7994bdd2682a301bbfa384259d225a8d
parent01703f3be6fae07d9fbb24f1b57b8c181cb59df9 (diff)
downloadvolse-hubzilla-60caffcd7776043ee89e5939b81d7bd9d948cd4e.tar.gz
volse-hubzilla-60caffcd7776043ee89e5939b81d7bd9d948cd4e.tar.bz2
volse-hubzilla-60caffcd7776043ee89e5939b81d7bd9d948cd4e.zip
convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field
-rw-r--r--include/certfns.php4
-rw-r--r--mod/xrd.php3
2 files changed, 6 insertions, 1 deletions
diff --git a/include/certfns.php b/include/certfns.php
index db0e4645e..ffdc7f0c3 100644
--- a/include/certfns.php
+++ b/include/certfns.php
@@ -121,6 +121,10 @@ function rsatopem($key) {
return(metopem($m,$e));
}
+function pemtorsa($key) {
+ pemtome($key,$m,$e);
+ return(metorsa($m,$e));
+}
function pemtome($key,&$m,&$e) {
require_once('include/salmon.php');
diff --git a/mod/xrd.php b/mod/xrd.php
index accc2f68e..4889639f0 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,6 +1,7 @@
<?php
require_once('salmon.php');
+require_once('certfns.php');
function xrd_content(&$a) {
@@ -34,7 +35,7 @@ function xrd_content(&$a) {
$dspr = replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(),
'$dspr_guid' => $r[0]['guid'],
- '$dspr_key' => base64_encode($r[0]['pubkey'])
+ '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
));
}
else