From 0bf8017e8ff13b0e03512305ea589b407af86cd8 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Thu, 13 Aug 2020 23:04:02 +0300 Subject: [PATCH] try_decrypt: do not use gossip_key if public_key is available public_key is updated with apply_header in try_decrypt right above this code, so it makes no sense to allow signing messages with gossip key. --- src/e2ee.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/e2ee.rs b/src/e2ee.rs index 0a357231a..f5b385861 100644 --- a/src/e2ee.rs +++ b/src/e2ee.rs @@ -166,11 +166,10 @@ pub async fn try_decrypt( } if let Some(peerstate) = peerstate { peerstate.handle_fingerprint_change(context).await?; - if let Some(key) = peerstate.gossip_key { - public_keyring_for_validate.add(key); - } if let Some(key) = peerstate.public_key { public_keyring_for_validate.add(key); + } else if let Some(key) = peerstate.gossip_key { + public_keyring_for_validate.add(key); } }