aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Daemon/Notifier.php2
-rw-r--r--include/crypto.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index af561c702..fa2368a92 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -651,7 +651,7 @@ class Notifier {
$packet = zot6_build_packet($channel,'notify',$env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
}
else {
- $packet = zot6_build_packet($channel,'notify',$env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
+ $packet = zot_build_packet($channel,'notify',$env, (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
}
diff --git a/include/crypto.php b/include/crypto.php
index 11654564e..ab33ba096 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -163,7 +163,7 @@ function other_encapsulate($data,$pubkey,$alg) {
return $result;
}
else {
- $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $subalg, 'result' => $data ];
+ $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ];
call_hooks('other_encapsulate', $x);
return $x['result'];
}
@@ -246,7 +246,7 @@ function other_unencapsulate($data,$prvkey,$alg) {
return $fn(base64url_decode($data['data']),$k,$i);
}
else {
- $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $subalg, 'result' => $data ];
+ $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data ];
call_hooks('other_unencapsulate',$x);
return $x['result'];
}