diff options
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 2 | ||||
| -rw-r--r-- | include/crypto.php | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 47db32206..af561c702 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -646,7 +646,7 @@ class Notifier { // with before switching to zot6 as the primary zot6 handler checks for the existence of a message delivery report // to trigger dequeue'ing - $z6 = (($encoded_item && $encoded_item['type'] === 'activity' && (! $encoded_item['allow_cid'])) ? true : false); + $z6 = (($encoded_item && $encoded_item['type'] === 'activity' && (! array_key_exists('allow_cid',$encoded_item))) ? true : false); if($z6) { $packet = zot6_build_packet($channel,'notify',$env, json_encode($encoded_item), (($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash); } diff --git a/include/crypto.php b/include/crypto.php index b732b17ad..f9cf20deb 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -126,11 +126,11 @@ function other_encapsulate($data,$pubkey,$alg) { if(strpos($alg,'.oaep')) { $oaep = true; - $alg = substr($alg,0,-5); + $subalg = substr($alg,0,-5); } - $fn = strtoupper($alg) . '_encrypt'; + $fn = strtoupper($subalg) . '_encrypt'; if(function_exists($fn)) { // A bit hesitant to use openssl_random_pseudo_bytes() as we know @@ -160,7 +160,7 @@ function other_encapsulate($data,$pubkey,$alg) { return $result; } else { - $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data ]; + $x = [ 'data' => $data, 'pubkey' => $pubkey, 'alg' => $subalg, 'result' => $data ]; call_hooks('other_encapsulate', $x); return $x['result']; } @@ -215,6 +215,7 @@ function aes_encapsulate($data,$pubkey) { function crypto_unencapsulate($data,$prvkey) { if(! $data) return; + $alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc'); if($alg === 'aes256cbc') return aes_unencapsulate($data,$prvkey); @@ -229,18 +230,18 @@ function other_unencapsulate($data,$prvkey,$alg) { if(strpos($alg,'.oaep')) { $oaep = true; - $alg = substr($alg,0,-5); + $subalg = substr($alg,0,-5); } - $fn = strtoupper($alg) . '_decrypt'; + $fn = strtoupper($subalg) . '_decrypt'; if(function_exists($fn)) { openssl_private_decrypt(base64url_decode($data['key']),$k,$prvkey,(($oaep) ? OPENSSL_PKCS1_OAEP_PADDING : OPENSSL_PKCS1_PADDING)); openssl_private_decrypt(base64url_decode($data['iv']),$i,$prvkey,(($oaep) ? OPENSSL_PKCS1_OAEP_PADDING : OPENSSL_PKCS1_PADDING)); return $fn(base64url_decode($data['data']),$k,$i); } else { - $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data ]; + $x = [ 'data' => $data, 'prvkey' => $prvkey, 'alg' => $subalg, 'result' => $data ]; call_hooks('other_unencapsulate',$x); return $x['result']; } |