From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 17 Apr 2010 20:17:15 +0000 (-0400)
Subject: fix gpg_ssh_fingerprint() in monkeysphere to use internal implementation of ssh finge... 
X-Git-Tag: monkeysphere_0.30~5
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=990913d29e5857f8d042fdc037088c05e70bdfa5;p=monkeysphere.git

fix gpg_ssh_fingerprint() in monkeysphere to use internal implementation of ssh fingerprinting
---

diff --git a/src/monkeysphere b/src/monkeysphere
index fe92960..121db36 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -68,18 +68,7 @@ gpg_user() {
 # output the ssh fingerprint of a gpg key
 gpg_ssh_fingerprint() {
     keyid="$1"
-    local tmpfile=$(msmktempfile)
-
-    # trap to remove tmp file if break
-    trap "rm -f $tmpfile" EXIT
-
-    # use temporary file, since ssh-keygen won't accept keys on stdin
-    gpg_user --export "$keyid" --no-armor | openpgp2ssh "$keyid" >"$tmpfile"
-    ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
-
-    # remove the tmp file
-    trap - EXIT
-    rm -rf "$tmpfile"
+    gpg_user --export "$keyid" --no-armor | "$SYSSHAREDIR/keytrans" openpgp2sshfpr "$keyid"
 }
 
 # take a secret key ID and check that only zero or one ID is provided,