src Standards

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index b8c771b75a0cd6f18ee2e4af8850c714307543d7..61be7966e06b95a036a59bab13d318a08edbb1b1 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -9,6 +9,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
+use Friendica\Object\Contact;
 use Friendica\Protocol\DFRN;
 
 require_once 'include/items.php';
@@ -127,13 +128,8 @@ function dfrn_notify_post(App $a) {
        logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
        if ($dissolve == 1) {
-
-               /*
-                * Relationship is dissolved permanently
-                */
-
-               require_once('include/Contact.php');
-               contact_remove($importer['id']);
+               // Relationship is dissolved permanently
+               Contact::remove($importer['id']);
                logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
                xml_status(0, 'relationship dissolved');
        }
@@ -179,13 +175,12 @@ function dfrn_notify_post(App $a) {
                                 *we got a key. old code send only the key, without RINO version.
                                 * we assume RINO 1 if key and no RINO version
                                 */
-                               $data = DFRN::aes_decrypt(hex2bin($data), $final_key);
+                               $data = DFRN::aesDecrypt(hex2bin($data), $final_key);
                                break;
                        case 2:
                                try {
-                                       $FinalKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($final_key);
-                                       $data = \Defuse\Crypto\Crypto::decrypt(hex2bin($data), $FinalKey);
-                               } catch (\Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException $ex) { // VERY IMPORTANT
+                                       $data = \Crypto::decrypt(hex2bin($data), $final_key);
+                               } catch (\InvalidCiphertextException $ex) { // VERY IMPORTANT
                                        /*
                                         * Either:
                                         *   1. The ciphertext was modified by the attacker,
@@ -195,9 +190,12 @@ function dfrn_notify_post(App $a) {
                                         */
                                        logger('The ciphertext has been tampered with!');
                                        xml_status(0, 'The ciphertext has been tampered with!');
-                               } catch (\Defuse\Crypto\Exception\EnvironmentIsBrokenException $ex) {
+                               } catch (\CryptoTestFailedException $ex) {
                                        logger('Cannot safely perform dencryption');
                                        xml_status(0, 'CryptoTestFailed');
+                               } catch (\CannotPerformOperationException $ex) {
+                                       logger('Cannot safely perform decryption');
+                                       xml_status(0, 'Cannot safely perform decryption');
                                }
                                break;
                        default: