From 990913d29e5857f8d042fdc037088c05e70bdfa5 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 17 Apr 2010 16:17:15 -0400 Subject: [PATCH] fix gpg_ssh_fingerprint() in monkeysphere to use internal implementation of ssh fingerprinting --- src/monkeysphere | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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, -- 2.26.2