3 files changed, 26 insertions, 62 deletions

diff --git a/src/share/mh/extend_key b/src/share/mh/extend_key
index d03b89a..79ee267 100644
--- a/src/share/mh/extend_key
+++ b/src/share/mh/extend_key
@@ -27,8 +27,9 @@ $extendTo
 save
 EOF
 
-echo
-echo "NOTE: Host key expiration date adjusted, but not yet published."
-echo "Run '$PGRM publish-key' to publish the new expiration date."
+cat <<EOF | log info
+NOTE: Host key expiration date adjusted, but not yet published.
+Run '$PGRM publish-key' to publish the new expiration date.
+EOF
 
 }
diff --git a/src/share/mh/gen_key b/src/share/mh/gen_key
index a73d85e..eb951cf 100644
--- a/src/share/mh/gen_key
+++ b/src/share/mh/gen_key
@@ -16,7 +16,7 @@ gen_key() {
 local keyType="RSA"
 local keyLength="2048"
 local keyUsage="auth"
-local keyExpire
+local keyExpire="0"
 local hostName=$(hostname -f)
 local userID
 local keyParameters
@@ -34,17 +34,13 @@ while true ; do
 		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
@@ -52,9 +48,6 @@ done
 
 userID="ssh://${hostName}"
 
-# prompt about key expiration if not specified
-keyExpire=$(get_gpg_expiration "$keyExpire")
-
 # set key parameters
 keyParameters=\
 "Key-Type: $keyType
@@ -63,7 +56,7 @@ Key-Usage: $keyUsage
 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}
@@ -79,6 +72,10 @@ keyParameters=\
 %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
 
@@ -88,13 +85,18 @@ fingerprint=$(fingerprint_host_key)
 # 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" | \
 	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 debug "exporting openpgp public key..."
+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"
 
 # show info about new key
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index e7b713f..2e73a8c 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -13,73 +13,34 @@
 
 import_key() {
 
-local hostName=$(hostname -f)
-local keyFile="/etc/ssh/ssh_host_rsa_key"
-local keyExpire
+local hostName
 local userID
+local fingerprint
 
 # check for presense of secret key
 # FIXME: is this the proper test to be doing here?
 fingerprint_host_key >/dev/null \
 	&& failure "An OpenPGP host key already exists."
 
-# get options
-while true ; do
-	case "$1" in
-	    -f|--keyfile)
-		keyFile="$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
-		;;
-		break
-		;;
-	esac
-done
-
-if [ ! -f "$keyFile" ] ; then
-	failure "SSH secret key file '$keyFile' not found."
-fi
+hostName=${1:-$(hostname -f)}
 
 userID="ssh://${hostName}"
 
-# prompt about key expiration if not specified
-keyExpire=$(get_gpg_expiration "$keyExpire")
-
-echo "The following key parameters will be used for the host private key:"
-echo "Import: $keyFile"
-echo "Name-Real: $userID"
-echo "Expire-Date: $keyExpire"
-
-read -p "Import key? (Y/n) " OK; OK=${OK:=Y}
-if [ ${OK/y/Y} != 'Y' ] ; then
-	failure "aborting."
-fi
+# create host home
+mkdir -p "$GNUPGHOME_HOST"
+chmod 700 "$GNUPGHOME_HOST"
 
 log verbose "importing ssh key..."
 # translate ssh key to a private key
 (umask 077 && \
-	pem2openpgp "$userID" "$keyExpire" < "$sshKey" | gpg_host --import)
+	pem2openpgp "$userID" | gpg_host --import)
 
 # find the key fingerprint of the newly converted key
 fingerprint=$(fingerprint_host_key)
 
-# export host ownertrust to authentication keyring
-log verbose "setting ultimate owner trust for host key..."
-echo "${fingerprint}:6:" | gpg_host "--import-ownertrust"
-
 # export public key to file
-gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${MHDATADIR}/ssh_host_rsa_key.pub.gpg"
+log debug "exporting openpgp public key..."
+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"
 
 # show info about new key