prefer pub key as a fallback key for encryption
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 27 Jul 2015 22:01:51 +0000 (18:01 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 7 Dec 2015 18:28:41 +0000 (13:28 -0500)
edward

diff --git a/edward b/edward
index ddb4487a61c466f43c4eb465aa3a36fd61c8c901..39f104d4680d80b126670f16267d85498c497253 100755 (executable)
--- 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):