From 0c19c4c75d7ef3d93eddcd09702915c083469c1e Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 21 Jan 2019 16:05:03 -0500
Subject: [PATCH] Fix missing reference to 'data' key in Util\Crypto
- Fix doc blocks
---
src/Util/Crypto.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 4f762964c9..2ab97e5373 100644
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -423,13 +423,13 @@ class Crypto
*
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
*
- * @param string $data
+ * @param array $data ['iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data]
* @param string $prvkey The private key used for decryption.
*
* @return string|boolean The decrypted string or false on failure.
* @throws \Exception
*/
- public static function unencapsulate($data, $prvkey)
+ public static function unencapsulate(array $data, $prvkey)
{
if (!$data) {
return;
@@ -437,23 +437,23 @@ class Crypto
$alg = ((array_key_exists('alg', $data)) ? $data['alg'] : 'aes256cbc');
if ($alg === 'aes256cbc') {
- return self::encapsulateAes($data, $prvkey);
+ return self::encapsulateAes($data['data'], $prvkey);
}
- return self::encapsulateOther($data, $prvkey, $alg);
+ return self::encapsulateOther($data['data'], $prvkey, $alg);
}
/**
*
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
*
- * @param string $data
+ * @param array $data
* @param string $prvkey The private key used for decryption.
* @param string $alg
*
* @return string|boolean The decrypted string or false on failure.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function unencapsulateOther($data, $prvkey, $alg)
+ private static function unencapsulateOther(array $data, $prvkey, $alg)
{
$fn = 'decrypt' . strtoupper($alg);
--
2.39.5