Merged stuff from upstream/master

[quix0rs-gnu-social.git] / plugins / OStatus / lib / salmonaction.php

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 2f48042820ba9add9c411afd7e761eac64a2ebeb..f328f0916a2a6d520dc7fd6f7caa26e092472ab0 100644 (file)
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -79,8 +79,17 @@ class SalmonAction extends Action
             $this->clientError($e->getMessage());
         }
 
+<<<<<<< .merge_file_l1W8if
         // Cryptographic verification test, throws exception on failure
         $magic_env->verify($this->actor);
+=======
+        // Cryptographic verification test
+        if (!$magic_env->verify($this->actor)) {
+            common_debug("Salmon signature verification failed.");
+            // TRANS: Client error.
+            $this->clientError(_m('Salmon signature verification failed.'));
+        }
+>>>>>>> .merge_file_ISiK5f
 
         return true;
     }