deprecate sshfpr; add sshfprs-for-userid (closes: MS #1436)

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 4d8eab649aca5570405352610d56771995391a4d..25421cef9fcf7580c1826c1315091e7b1ad9aefa 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -128,14 +128,13 @@ specify the full fingerprints of specific keys to add to the agent
 (space separated), instead of adding them all.  `s' may be used in
 place of `subkey\-to\-ssh\-agent'.
 .TP
-.B sshfpr KEYID
-Output the ssh fingerprint of a key in your gpg keyring. `f' may be
-used in place of `fingerprint'.
-.TP
 .B keys\-for\-userid USERID
-Output to stdout all acceptable keys for a given user ID literal.
+Output to stdout all acceptable keys for a given user ID.
 `u' may be used in place of `keys\-for\-userid'.
 .TP
+.B sshfprs\-for\-userid USERID
+Output the ssh fingerprints of acceptable keys for a given user ID.
+.TP
 .B version
 Show the monkeysphere version number.  `v' may be used in place of
 `version'.

diff --git a/src/monkeysphere b/src/monkeysphere
index 8e6e81a5aeb85f887be2a304885979da3d1923cf..2d5cba8de2fe95d1b624a17099710793a1c36b20 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -48,9 +48,9 @@ subcommands:
  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
 
- keys-for-userid (u) USERID          output valid keys for user id literal
+ keys-for-userid (u) USERID          output valid keys for given user ids
+ sshfprs-for-userid USERID           output ssh fingerprints for given user ids
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
 
@@ -271,7 +271,8 @@ case $COMMAND in
        subkey_to_ssh_agent "$@"
        ;;
 
-    'sshfpr'|'f')
+    'sshfpr')
+       echo "Warning: 'sshfpr' is deprecated.  Please use 'sshfprs-for-userid' instead." >&2
        gpg_ssh_fingerprint "$@"
        ;;
 
@@ -280,6 +281,19 @@ case $COMMAND in
        keys_for_userid "$@"
        ;;
 
+    'sshfprs-for-userid')
+       CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}
+        keytmpdir=$(msmktempdir)
+        keytmpfile="$keytmpdir/ "
+        cd "$keytmpdir"
+       keys_for_userid "$@" | while read KEYLINE ; do
+            printf '%s\n' "$KEYLINE" > "$keytmpdir/ "
+            ssh-keygen -l -f ' '
+        done
+        rm -f "$keytmpfile"
+        rmdir "$keytmpdir"
+       ;;
+
     'keys-from-userid')
        echo "Warning: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
        CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=${CHECK_KEYSERVER:="true"}}