Merge commit 'jrollins/master'

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 9b31ee09d1c487aacbbd30733c89580b05d39a2d..a67715f3ae30fd60f92d9263c591ecc8082159ce 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -85,8 +85,6 @@ gpg_host_list() {
 }
 
 # command for edit key scripts, takes scripts on stdin
-# FIXME: should we supress all the edit script spew?  or pipe it
-# through log debug?
 gpg_host_edit() {
     gpg_host --command-fd 0 --edit-key "0x${HOST_FINGERPRINT}!" "$@"
 }
@@ -112,7 +110,7 @@ load_fingerprint() {
            && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
            | grep '^fpr:' | cut -d: -f10 )
     else
-       HOST_FINGERPRINT=
+       failure "host key gpg pub file not found."
     fi
 }
 
@@ -174,6 +172,11 @@ show_key() {
     # import the host key into the tmp dir
     gpg --quiet --import <"$HOST_KEY_FILE"
 
+    # create the ssh key
+    TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
+    openpgp2ssh <"$HOST_KEY_FILE" 2>/dev/null >"$TMPSSH"
+
+    # get the gpg fingerprint
     HOST_FINGERPRINT=$(gpg --quiet --list-keys --with-colons --with-fingerprint \
        | grep '^fpr:' | cut -d: -f10 )
 
@@ -190,9 +193,7 @@ show_key() {
 
     # list the ssh fingerprint
     echo -n "ssh fingerprint: "
-    ssh-keygen -l -f /dev/stdin \
-       <<<$(openpgp2ssh <"$HOST_KEY_FILE" 2>/dev/null) \
-       | awk '{ print $1, $2, $4 }'
+    ssh-keygen -l -f "$TMPSSH" | awk '{ print $1, $2, $4 }'
 
     # remove the tmp file
     trap - EXIT
@@ -295,6 +296,7 @@ case $COMMAND in
        ;;
 
     'update-gpg-pub-file')
+       load_fingerprint_secret
        update_gpg_pub_file
        ;;