friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix missing reference to 'data' key in Util\Crypto 

- Fix doc blocks
This commit is contained in:
Hypolite Petovan 2019-01-21 16:05:03 -05:00
parent 6657bfe2b2
commit 0c19c4c75d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Util/Crypto.php
View File

@ -423,13 +423,13 @@ class Crypto
* *
* Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php * 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. * @param string $prvkey The private key used for decryption.
* *
* @return string|boolean The decrypted string or false on failure. * @return string|boolean The decrypted string or false on failure.
* @throws \Exception * @throws \Exception
*/ */
public static function unencapsulate($data, $prvkey) public static function unencapsulate(array $data, $prvkey)
{ {
if (!$data) { if (!$data) {
return; return;
@ -437,23 +437,23 @@ class Crypto
$alg = ((array_key_exists('alg', $data)) ? $data['alg'] : 'aes256cbc'); $alg = ((array_key_exists('alg', $data)) ? $data['alg'] : 'aes256cbc');
if ($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 * 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 $prvkey The private key used for decryption.
* @param string $alg * @param string $alg
* *
* @return string|boolean The decrypted string or false on failure. * @return string|boolean The decrypted string or false on failure.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private static function unencapsulateOther($data, $prvkey, $alg) private static function unencapsulateOther(array $data, $prvkey, $alg)
{ {
$fn = 'decrypt' . strtoupper($alg); $fn = 'decrypt' . strtoupper($alg);