From dbeee4707b73c87684146fefa15c2caaf323f921 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 20 Feb 2018 11:56:51 -0800 Subject: don't try to handle OAEP for plugin crypto methods; let them do it if desired --- include/crypto.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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']; } -- cgit v1.2.3 From b4dad817677dbe23221901752cba60418c05287e Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 20 Feb 2018 14:41:46 -0800 Subject: copy/paste error resulting in bad behaviour --- Zotlabs/Daemon/Notifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.3