harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2018-02-20 23:58:17 +01:00
commit 85a6dd6031
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Daemon/Notifier.php
View File

@ -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); $packet = zot6_build_packet($channel,'notify',$env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);
} }
else { 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);
} }

4
include/crypto.php
View File

@ -163,7 +163,7 @@ function other_encapsulate($data,$pubkey,$alg) {
return $result; return $result;
} }
else { else {
$x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $subalg, 'result' => $data ]; $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ];
call_hooks('other_encapsulate', $x); call_hooks('other_encapsulate', $x);
return $x['result']; return $x['result'];
} }
@ -246,7 +246,7 @@ function other_unencapsulate($data,$prvkey,$alg) {
return $fn(base64url_decode($data['data']),$k,$i); return $fn(base64url_decode($data['data']),$k,$i);
} }
else { else {
$x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $subalg, 'result' => $data ]; $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data ];
call_hooks('other_unencapsulate',$x); call_hooks('other_unencapsulate',$x);
return $x['result']; return $x['result'];
} }