From 6a43a89f5b2cd6ce91fa9c0bfddb5e2d44e77200 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 17 Nov 2008 18:07:33 -0500
Subject: HA! I figured out how to get ssh-keygen to read stdin by using the
bash "Here Strings" redirection. No more stupid tempfiles to get ssh key
fingerprints.
---
src/monkeysphere-ssh-proxycommand | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'src/monkeysphere-ssh-proxycommand')
diff --git a/src/monkeysphere-ssh-proxycommand b/src/monkeysphere-ssh-proxycommand
index b3dc562..a609199 100755
--- a/src/monkeysphere-ssh-proxycommand
+++ b/src/monkeysphere-ssh-proxycommand
@@ -77,12 +77,11 @@ output_no_valid_key() {
log "An OpenPGP key matching the ssh key offered by the host was found:"
log
- # get the fingerprint of the ssh key
- tmpkey=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX)
- echo "$sshKeyGPG" > "$tmpkey"
- sshFingerprint=$(ssh-keygen -l -f "$tmpkey" | \
+ # do some crazy "Here Strings" redirection to get the key to
+ # ssh-keygen, since it doesn't read from stdin cleanly
+ sshFingerprint=$(ssh-keygen -l -f /dev/stdin \
+ <<<$(echo "$sshKeyGPG") | \
awk '{ print $2 }')
- rm -rf "$tmpkey"
# get the sigs for the matching key
gpgSigOut=$(gpg --check-sigs \
--
cgit v1.2.3