more z6 debugging

2018-11-11 15:12:01 -08:00
parent c80ac58eff
commit da452decf6
5 changed files with 21 additions and 10 deletions
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -225,9 +225,14 @@ function crypto_unencapsulate($data,$prvkey) {
 	if(! $data)
 		return;

-	$alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc');
-	if($alg === 'aes256cbc')
+	$alg = ((is_array($data) && array_key_exists('encrypted',$data)) ? $data['alg'] : '');
+    if(! $alg) {
+		return $data;
+    }
+
+	if($alg === 'aes256cbc') {
 		return aes_unencapsulate($data,$prvkey);
+	}

 	return other_unencapsulate($data,$prvkey,$alg);