Ensure ParseUrl::getSiteinfo always returns the url and type keys

[friendica.git] / src / Util / Crypto.php

diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 1b84a92f64a3f9e6ae7bcaa0815fc7a271b77432..8adacf71041bf41953fda879f7b73a4bfb9d3e22 100644 (file)
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -393,7 +393,7 @@ class Crypto
                        // log the offending call so we can track it down
                        if (!openssl_public_encrypt($key, $k, $pubkey)) {
                                $x = debug_backtrace();
-                               Logger::log('RSA failed. ' . print_r($x[0], true));
+                               Logger::notice('RSA failed', ['trace' => $x[0]]);
                        }
 
                        $result['alg'] = $alg;
@@ -461,11 +461,12 @@ class Crypto
                        return;
                }
 
-               $alg = ((array_key_exists('alg', $data)) ? $data['alg'] : 'aes256cbc');
+               $alg = $data['alg'] ?? 'aes256cbc';
                if ($alg === 'aes256cbc') {
-                       return self::encapsulateAes($data['data'], $prvkey);
+                       return self::unencapsulateAes($data['data'], $prvkey);
                }
-               return self::encapsulateOther($data['data'], $prvkey, $alg);
+
+               return self::unencapsulateOther($data, $prvkey, $alg);
        }
 
        /**