Merge commit 'dkg/master'

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index fbc05b4fd5587780b2374273d2975dc331dd9ad2..6f43632307b25d235ed5094457e96fe77de5b7a8 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -48,7 +48,9 @@ subcommands:
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
  ssh-proxycommand HOST [PORT]        monkeysphere ssh ProxyCommand
+   --no-connect                        do not make TCP connection to host
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
+ sshfpr (f) KEYID                    output ssh fingerprint of gpg key
  version (v)                         show version number
  help (h,?)                          this help
 
@@ -60,6 +62,23 @@ gpg_user() {
     gpg --no-greeting --quiet --no-tty "$@"
 }
 
+# output the ssh fingerprint of a gpg key
+gpg_ssh_fingerprint() {
+    keyid="$1"
+    local tmpfile=$(mktemp)
+
+    # 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" | openpgp2ssh "$keyid" >"$tmpfile"
+    ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
+
+    # remove the tmp file
+    trap - EXIT
+    rm -rf "$tmpfile"
+}
+
 # take a secret key ID and check that only zero or one ID is provided,
 # and that it corresponds to only a single secret key ID
 check_gpg_sec_key_id() {
@@ -242,6 +261,10 @@ case $COMMAND in
        subkey_to_ssh_agent "$@"
        ;;
 
+    'sshfpr'|'f')
+       gpg_ssh_fingerprint "$@"
+       ;;
+
     'version'|'v')
        version
        ;;