X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=341b9fdbd4fefa8366a5d38205e99559d19e84d0;hb=65dfc0ba7f918b0a2787c1cc918e70fe3f247438;hp=2e3bc16f8e96180d67f6f3d17429295163356a47;hpb=4d3d6d2b49d21e5e1ed0b0d3e32d21f99b0e2588;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 2e3bc16..341b9fd 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -47,8 +47,10 @@ subcommands:
  update-authorized_keys (a)          update authorized_keys file
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
- ssh-proxycommand                    monkeysphere ssh ProxyCommand
+ 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() {
@@ -125,7 +144,8 @@ check_gpg_authentication_subkey() {
 	if [ "$validity" = 'u' ] ; then
 	    echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
 	    if [ "$PROMPT" = "true" ] ; then
-		read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N}
+		printf "Are you sure you would like to generate another one? (y/N) " >&2
+		read OK; OK=${OK:N}
 		if [ "${OK/y/Y}" != 'Y' ] ; then
 		    failure "aborting."
 		fi
@@ -242,6 +262,10 @@ case $COMMAND in
 	subkey_to_ssh_agent "$@"
 	;;
 
+    'sshfpr'|'f')
+	gpg_ssh_fingerprint "$@"
+	;;
+
     'version'|'v')
 	version
 	;;