From: Andrew Engelbrecht <sudoman@ninthfloor.org>
Date: Mon, 27 Jul 2015 22:01:51 +0000 (-0400)
Subject: prefer pub key as a fallback key for encryption
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3ceb92e584422b4269f549826c7fe10125710bbf;p=edward.git

prefer pub key as a fallback key for encryption
---

diff --git a/edward b/edward
index ddb4487..39f104d 100755
--- a/edward
+++ b/edward
@@ -742,8 +742,8 @@ def prepare_for_reply_pubkey (piece, replyinfo_obj):
     else:
         replyinfo_obj.public_key_received = True
 
-        if replyinfo_obj.fallback_target_key == None:
-            replyinfo_obj.fallback_target_key = piece.gpg_data.keys[0]
+        # prefer public key as a fallback for the encrypted reply
+        replyinfo_obj.fallback_target_key = piece.gpg_data.keys[0]
 
 
 def prepare_for_reply_sig (piece, replyinfo_obj):