From 727ab78f9aacb50dff76b3a9cfea80ef781af371 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 23 Jul 2013 20:51:37 -0700 Subject: crypto logging --- include/crypto.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/crypto.php b/include/crypto.php index ed32356ec..9d36c24ec 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -211,11 +211,15 @@ function AES256CBC_decrypt($data,$key,$iv) { } function aes_encapsulate($data,$pubkey) { + if(! $pubkey) + logger('aes_encapsulate: no key. data: ' . $data); $key = random_string(32,RANDOM_STRING_TEXT); $iv = random_string(16,RANDOM_STRING_TEXT); $result['data'] = base64url_encode(AES256CBC_encrypt($data,$key,$iv),true); - openssl_public_encrypt($key,$k,$pubkey); - $result['key'] = base64url_encode($k,true); + if(! openssl_public_encrypt($key,$k,$pubkey)) { + logger('aes_encapsulate: RSA failed. ' . print_r(debug_backtrace(),true)); + } + $result['key'] = base64url_encode($k,true); openssl_public_encrypt($iv,$i,$pubkey); $result['iv'] = base64url_encode($i,true); return $result; -- cgit v1.2.3