domain name you chose appears to only have the local part. For
example: don't use 'ssh://foo' ; use 'ssh://foo.example.com' instead."
- [[ "$name" =~ ^[a-z]([a-z0-9-]*[a-z0-9])?://[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.|((\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+))(:[1-9][0-9]{0,4})?$ ]] || \
+ [[ "$name" =~ ^[a-z0-9]([a-z0-9-]*[a-z0-9])?://[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.|((\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+))(:[1-9][0-9]{0,4})?$ ]] || \
failure "Not a valid service name: '$name'
Service names look like <scheme>://full.example.com[:<portnumber>],
shift
local keys=$@
local i=0
- local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
local key
check_no_keys
+ local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+
if [[ -z "$1" || "$1" == '--all' ]] ; then
keys="${fprs[@]}"
fi
# create the ssh key
tmpssh="$GNUPGHOME"/ssh_host_key_rsa_pub
- gpg --export "$fingerprint" 2>/dev/null \
+ gpg --export --no-armor "$fingerprint" 2>/dev/null \
| openpgp2ssh 2>/dev/null >"$tmpssh"
# list the host key info
shift
case $COMMAND in
- 'import-key'|'i')
+ 'import-key'|'import'|'i')
source "${MHSHAREDIR}/import_key"
import_key "$@"
;;
multi_key show_key "$@"
;;
- 'set-expire'|'extend-key'|'e')
+ 'set-expire'|'extend-key'|'extend'|'e')
source "${MHSHAREDIR}/set_expire"
set_expire "$@"
;;
update_pgp_pub_file
;;
- 'version'|'v')
+ 'version'|'--version'|'v')
version
;;