oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to new php-encryption library version

Browse source 
- Remove references to library/ files
- Add namespace to library classes
This commit is contained in:
Hypolite Petovan 2017-11-09 02:21:37 -05:00
parent 3b2cd85483
commit acd65aade1
3 changed files with 10 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mod/dfrn_notify.php
View file

@ -11,10 +11,8 @@ use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Protocol\DFRN;
require_once('include/items.php');
require_once('include/event.php');
require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
require_once 'include/items.php';
require_once 'include/event.php';
function dfrn_notify_post(App $a) {
logger(__function__, LOGGER_TRACE);
@ -185,8 +183,8 @@ function dfrn_notify_post(App $a) {
break;
case 2:
try {
$data = Crypto::decrypt(hex2bin($data), $final_key);
} catch (InvalidCiphertext $ex) { // VERY IMPORTANT
$data = \Defuse\Crypto\Crypto::decrypt(hex2bin($data), $final_key);
} catch (\Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) { // VERY IMPORTANT
/*
* Either:
* 1. The ciphertext was modified by the attacker,
@ -196,12 +194,9 @@ function dfrn_notify_post(App $a) {
*/
logger('The ciphertext has been tampered with!');
xml_status(0, 'The ciphertext has been tampered with!');
} catch (Ex\CryptoTestFailed $ex) {
} catch (\Defuse\Crypto\Exception\EnvironmentIsBrokenException $ex) {
logger('Cannot safely perform dencryption');
xml_status(0, 'CryptoTestFailed');
} catch (Ex\CannotPerformOperation $ex) {
logger('Cannot safely perform decryption');
xml_status(0, 'Cannot safely perform decryption');
}
break;
default: