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 d44800e94282514b88c8b0383f96dd37f3823d88..8adacf71041bf41953fda879f7b73a4bfb9d3e22 100644 (file)
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -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);
        }
 
        /**