summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2014-05-05 21:37:40 -0400
committerbnewbold <bnewbold@robocracy.org>2014-05-05 21:39:03 -0400
commit65641576a9596b512e92d894f6919ed42862c448 (patch)
tree6e532deb565457ea1b2ac5dd40cf67f2538a359b
parent7d7bc6e4561f2c66f41c48cc3b9e3fe19f0fcb2d (diff)
downloadopenwrt-repro-65641576a9596b512e92d894f6919ed42862c448.tar.gz
openwrt-repro-65641576a9596b512e92d894f6919ed42862c448.zip
ez-pine-gpg: multi-key tweaks
-rwxr-xr-xbin/ez-pine-gpg-sign2
-rwxr-xr-xbin/ez-pine-gpg-sign-and-encrypt2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ez-pine-gpg-sign b/bin/ez-pine-gpg-sign
index fe9a994..0adb08e 100755
--- a/bin/ez-pine-gpg-sign
+++ b/bin/ez-pine-gpg-sign
@@ -116,7 +116,7 @@ trap 'gpg_failed' 2
## pipe the message body into the gpg clearsign command
## pine will read the signed message from STDOUT
##
-{ echo "${body}" ; echo ; } | gpg --local-user "${from}" --clearsign || gpg_failed
+{ echo "${body}" ; echo ; } | gpg --clearsign || gpg_failed
#############################################
## unset variables that we don't need anymore
diff --git a/bin/ez-pine-gpg-sign-and-encrypt b/bin/ez-pine-gpg-sign-and-encrypt
index 9994687..82ebfca 100755
--- a/bin/ez-pine-gpg-sign-and-encrypt
+++ b/bin/ez-pine-gpg-sign-and-encrypt
@@ -121,7 +121,7 @@ recipients=`ez-pine-gpg-helper-recipient ${@}` || gpg_failed ${@}
##
cr=`printf '\015'`
echo "${msg}" | sed "1,/^${cr}\$/d" \
- | gpg --sign --encrypt --local-user "${from}" --armor ${recipients} || gpg_failed ${recipients}
+ | gpg --sign --encrypt --armor ${recipients} || gpg_failed ${recipients}
#############################################
## unset variables that we don't need anymore