From: rhatto <rhatto>
Date: Mon, 9 Oct 2006 20:41:47 +0000 (+0000)
Subject: sendkey pgp/mime fix
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ef35595696078577d1f8b2c675cae3258e138870;p=firma.git

sendkey pgp/mime fix
---

diff --git a/firma b/firma
index 670f6aa..ffeec56 100755
--- a/firma
+++ b/firma
@@ -1409,8 +1409,8 @@ Content-Type: multipart/encrypted;
   boundary=\"${boundary}\"
 Content-Disposition: inline"
 
+    # this is the body of the message to be sent, so no indentation here
     MESSAGE_BODY="`$GPG --armor --export $LIST_ADDRESS`"
-    MESSAGE_BODY="`echo -e "${PASSPHRASE}\n${MESSAGE_BODY}" | $GPG_ENCRYPT --recipient $recipients`"
     MESSAGE_BODY="\
 Content-Type: multipart/mixed; boundary=\"$keyboundary\"
 Content-Disposition: inline
@@ -1424,6 +1424,9 @@ $MESSAGE_BODY
 
 --${keyboundary}--"
 
+    # now encrypt the message body
+    MESSAGE_BODY="`echo -e "${PASSPHRASE}\n${MESSAGE_BODY}" | $GPG_ENCRYPT --recipient $recipients`"
+
     # this is the body of the message to be sent, so no indentation here
     MESSAGE_BODY="\
 This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)