aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/crypto.php3
-rw-r--r--version.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/crypto.php b/include/crypto.php
index 9d36c24ec..b78c4d43a 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -217,7 +217,8 @@ function aes_encapsulate($data,$pubkey) {
$iv = random_string(16,RANDOM_STRING_TEXT);
$result['data'] = base64url_encode(AES256CBC_encrypt($data,$key,$iv),true);
if(! openssl_public_encrypt($key,$k,$pubkey)) {
- logger('aes_encapsulate: RSA failed. ' . print_r(debug_backtrace(),true));
+ $x = debug_backtrace();
+ logger('aes_encapsulate: RSA failed. ' . print_r($x[0],true));
}
$result['key'] = base64url_encode($k,true);
openssl_public_encrypt($iv,$i,$pubkey);
diff --git a/version.inc b/version.inc
index a4dd3e760..164368ab4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-07-23.383
+2013-07-24.384