From a6835f4e714b0648717672767aa32625b72dfc47 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 5 Oct 2017 23:01:42 -0700 Subject: changes to encryption encapsulation for zot6 (backward compatible) --- include/crypto.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/crypto.php') diff --git a/include/crypto.php b/include/crypto.php index 6ac3fd732..622add4dc 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -148,6 +148,7 @@ function other_encapsulate($data,$pubkey,$alg) { // compromised by state actors and evidence is mounting that this has // already happened. + $result = [ 'encrypted' => true ]; $key = openssl_random_pseudo_bytes(256); $iv = openssl_random_pseudo_bytes(256); $result['data'] = base64url_encode($fn($data,$key,$iv),true); @@ -200,6 +201,9 @@ function aes_encapsulate($data,$pubkey) { logger('aes_encapsulate: no key. data: ' . $data); $key = openssl_random_pseudo_bytes(32); $iv = openssl_random_pseudo_bytes(16); + + $result = [ 'encrypted' => true ]; + $result['data'] = base64url_encode(AES256CBC_encrypt($data,$key,$iv),true); // log the offending call so we can track it down if(! openssl_public_encrypt($key,$k,$pubkey)) { -- cgit v1.2.3