# monkeysphere: Monkeysphere client tool
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
# Micah Anderson <micah@riseup.net>
subkey-to-ssh-agent (s) store authentication subkey in ssh-agent
sshfpr (f) KEYID output ssh fingerprint of gpg key
- keys-from-userid (u) USERID output valid keys for user id literal
+ keys-for-userid (u) USERID output valid keys for user id literal
gen-subkey (g) [KEYID] generate an authentication subkey
--length (-l) BITS key length in bits (2048)
trap "rm -f $tmpfile" EXIT
# use temporary file, since ssh-keygen won't accept keys on stdin
- gpg_user --export "$keyid" | openpgp2ssh "$keyid" >"$tmpfile"
+ gpg_user --export "$keyid" --no-armor | openpgp2ssh "$keyid" >"$tmpfile"
ssh-keygen -l -f "$tmpfile" | awk '{ print $1, $2, $4 }'
# remove the tmp file
# if authentication key is valid, prompt to continue
if [ "$validity" = 'u' ] ; then
echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
- if [ "$PROMPT" = "true" ] ; then
+ if [ "$PROMPT" != "false" ] ; then
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
export LOG_LEVEL
export LOG_PREFIX
+if [ "$#" -eq 0 ] ; then
+ usage
+ failure "Please supply a subcommand."
+fi
+
# get subcommand
COMMAND="$1"
-[ "$COMMAND" ] || $PGRM help
shift
case $COMMAND in
process_authorized_user_ids "$AUTHORIZED_USER_IDS"
;;
- 'import-subkey'|'i')
+ 'import-subkey'|'import'|'i')
source "${MSHAREDIR}/import_subkey"
import_subkey "$@"
;;
gpg_ssh_fingerprint "$@"
;;
- 'keys-from-userid'|'u')
- keys_from_userid "$@"
+ 'keys-for-userid'|'u')
+ keys_for_userid "$@"
+ ;;
+
+ 'keys-from-userid')
+ echo "Warning: 'keys-from-userid' is deprecated. Please use 'keys-for-userid' instead." >&2
+ keys_for_userid "$@"
;;
- 'version'|'v')
+ 'version'|'--version'|'v')
version
;;
- '--help'|'help'|'-h'|'h'|'?')
+ 'help'|'--help'|'-h'|'h'|'?')
usage
;;
*)
failure "Unknown command: '$COMMAND'
-Type '$PGRM help' for usage."
+Try '$PGRM help' for usage."
;;
esac