From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sat, 17 Apr 2010 20:13:53 +0000 (-0400)
Subject: monkeysphere-host no longer depends on ssh
X-Git-Tag: monkeysphere_0.30~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=38a5e8544d0698c8b4319359780bb1ec2bc846e1;p=monkeysphere.git

monkeysphere-host no longer depends on ssh
---

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index a5db8c1..13cc3ca 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -279,7 +279,6 @@ show_key() {
     local id="$1"
     local GNUPGHOME
     local fingerprint
-    local tmpssh
     local revokers
 
     # tmp gpghome dir
@@ -300,11 +299,6 @@ show_key() {
 	failure "ID '$id' not found."
     fi
 
-    # create the ssh key
-    tmpssh="$GNUPGHOME"/ssh_host_key_rsa_pub
-    gpg --export --no-armor "$fingerprint" 2>/dev/null \
-	| openpgp2ssh 2>/dev/null >"$tmpssh"
-
     # list the host key info
     # FIXME: make no-show-keyring work so we don't have to do the grep'ing
     # FIXME: can we show uid validity somehow?
@@ -327,8 +321,8 @@ show_key() {
     echo "OpenPGP fingerprint: $fingerprint"
 
     # list the ssh fingerprint
-    echo -n "ssh fingerprint: "
-    ssh-keygen -l -f "$tmpssh" | awk '{ print $1, $2, $4 }'
+    printf "ssh fingerprint: %s\n" \
+    "$(gpg --export --no-armor "$fingerprint" 2>/dev/null | "$SYSSHAREDIR/keytrans" openpgp2sshfpr "$fingerprint")"
 
     # remove the tmp file
     trap - EXIT