diff options
author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2010-02-18 12:11:47 -0500 |
---|---|---|
committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2010-02-18 12:11:47 -0500 |
commit | e3bb810e188cae2d40a5191500a501c85cb93381 (patch) | |
tree | b6afe37b95e8898cb8dd3577b62bc7859c3e3ed4 /src/monkeysphere | |
parent | 838f52739cc05bfaca19e49bc64c17b435022f1c (diff) |
enforce --no-armor when exporting to openpgp2ssh in case weird gpg.conf options (see bug 1625)
Diffstat (limited to 'src/monkeysphere')
-rwxr-xr-x | src/monkeysphere | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/monkeysphere b/src/monkeysphere index 648f5e9..e268058 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -74,7 +74,7 @@ gpg_ssh_fingerprint() { trap "rm -f $tmpfile" EXIT # use temporary file, since ssh-keygen won't accept keys on stdin - gpg_user --export "$keyid" | openpgp2ssh "$keyid" >"$tmpfile" + gpg_user --export "$keyid" --no-armor | openpgp2ssh "$keyid" >"$tmpfile" ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }' # remove the tmp file |