Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / hostxrd.php

diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index a1c24765b4a40e28755961ed22550f4a59c27178..9b2411f26692a659b2b15c573356348158f1903c 100644 (file)
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -8,31 +8,15 @@ function hostxrd_init(&$a) {
        $pubkey = get_config('system','site_pubkey');
 
        if(! $pubkey) {
+               $res = new_keypair(1024);
 
-               // should only have to ever do this once.
-
-               $res=openssl_pkey_new(array(
-                       'digest_alg' => 'sha1',
-                       'private_key_bits' => 4096,
-                       'encrypt_key' => false ));
-
-
-               $prvkey = '';
-
-               openssl_pkey_export($res, $prvkey);
-
-               // Get public key
-
-               $pkey = openssl_pkey_get_details($res);
-               $pubkey = $pkey["key"];
-
-               set_config('system','site_prvkey', $prvkey);
-               set_config('system','site_pubkey', $pubkey);
+               set_config('system','site_prvkey', $res['prvkey']);
+               set_config('system','site_pubkey', $res['pubkey']);
        }
 
        $tpl = file_get_contents('view/xrd_host.tpl');
        echo str_replace(array(
-               '$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+               '$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
        session_write_close();
        exit();