local keyType="RSA"
local keyLength="2048"
local keyUsage="auth"
-local keyExpire
+local keyExpire="0"
local hostName=$(hostname -f)
local userID
local keyParameters
# check for presense of secret key
# FIXME: is this the proper test to be doing here?
-fingerprint_server_key >/dev/null \
+fingerprint_host_key >/dev/null \
&& failure "An OpenPGP host key already exists."
# get options
keyLength="$2"
shift 2
;;
- -e|--expire)
- keyExpire="$2"
- shift 2
- ;;
*)
if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
failure "Unknown option '$1'.
Type '$PGRM help' for usage."
fi
hostName="$1"
- shift;
+ shift
break
;;
esac
userID="ssh://${hostName}"
-# prompt about key expiration if not specified
-keyExpire=$(get_gpg_expiration "$keyExpire")
-
# set key parameters
keyParameters=\
"Key-Type: $keyType
Name-Real: $userID
Expire-Date: $keyExpire"
-echo "The following key parameters will be used for the host private key:"
+echo "The following key parameters will be used for the host key:"
echo "$keyParameters"
read -p "Generate key? (Y/n) " OK; OK=${OK:=Y}
%commit
%echo done"
+# create host home
+mkdir -p "$GNUPGHOME_HOST"
+chmod 700 "$GNUPGHOME_HOST"
+
log verbose "generating host key..."
echo "$keyParameters" | gpg_host --batch --gen-key
-# find the key fingerprint of the newly generated key
-fingerprint=$(fingerprint_server_key)
+# find the key fingerprint of the newly converted key
+HOST_FINGERPRINT=$(fingerprint_host_key)
+export HOST_FINGERPRINT
# translate the private key to ssh format, and export to a file
# for sshs usage.
# NOTE: assumes that the primary key is the proper key to use
+log debug "exporting new secret key to ssh format..."
(umask 077 && \
- gpg_host --export-secret-key "$fingerprint" | \
+ gpg_host --export-secret-key "$HOST_FINGERPRINT" | \
openpgp2ssh "$fingerprint" > "${MHDATADIR}/ssh_host_rsa_key")
log info "SSH host private key output to file: ${MHDATADIR}/ssh_host_rsa_key"
+
+log debug "creating ssh public key..."
ssh-keygen -y -f "${MHDATADIR}/ssh_host_rsa_key" > "${MHDATADIR}/ssh_host_rsa_key.pub"
log info "SSH host public key output to file: ${MHDATADIR}/ssh_host_rsa_key.pub"
-gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
-log info "SSH host public key in OpenPGP form: ${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
+
+# export public key to file
+gpg_host_export_to_ssh_file
# show info about new key
show_key