aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-12-17 18:14:32 -0800
committerzotlabs <mike@macgirvin.com>2018-12-17 18:14:32 -0800
commit8d70b919551f6f6462e639f7cfffda9825344e43 (patch)
tree764766ffbecfa5e65f8344ea0f40371b5728bd80
parenta33ed05bec38d35131d72e9b3d6d61b5d6a2daaf (diff)
downloadvolse-hubzilla-8d70b919551f6f6462e639f7cfffda9825344e43.tar.gz
volse-hubzilla-8d70b919551f6f6462e639f7cfffda9825344e43.tar.bz2
volse-hubzilla-8d70b919551f6f6462e639f7cfffda9825344e43.zip
regression: mail from dev to core not delivering
-rw-r--r--Zotlabs/Daemon/Notifier.php7
-rw-r--r--include/zot.php2
2 files changed, 8 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 8b81c49da..beb30ed96 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -625,7 +625,12 @@ class Notifier {
continue;
}
- $hash = new_uuid();
+ // Do not change this to a uuid as long as we have traditional zot servers
+ // in the loop. The signature verification step can't handle dashes in the
+ // hashes.
+
+ $hash = random_string(48);
+
$packet = null;
$pmsg = '';
diff --git a/include/zot.php b/include/zot.php
index d031b4a96..9934dae07 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1232,6 +1232,7 @@ function zot_fetch($arr) {
$datatosend = json_encode(crypto_encapsulate(json_encode($data),$hub['hubloc_sitekey'], $algorithm));
$import = zot_zot($url,$datatosend);
+
}
else {
$algorithm = zot_best_algorithm($hub['site_crypto']);
@@ -4913,6 +4914,7 @@ function zot_reply_pickup($data) {
dbesc($data['secret']),
dbesc($data['callback'])
);
+
if(! $r) {
$ret['message'] = 'nothing to pick up';
logger('mod_zot: pickup: ' . $ret['message']);