From 0c874fdd6abfa4b74d7805f2d2d121f08211b4aa Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 16 Feb 2009 20:15:58 -0500
Subject: Stop all creation of a ssh_host_rsa_key.pub.  Use openpgp2ssh to get
 the fingerprint from the host pgp public key.  Prevents us from having to
 maintain the ssh pub key file, and generally makes things simpler. Also
 allows us to go back to having import_key take the key on stdin (which dkg
 will like).

---
 src/share/mh/import_key | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/share/mh/import_key')

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index e5982ca..74dc0b3 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -13,14 +13,10 @@
 
 import_key() {
 
-local keyFile
 local hostName
 local userID
 
-keyFile="$1"
-[ -f "$keyFile" ]
-
-hostName=${2:-$(hostname -f)}
+hostName=${1:-$(hostname -f)}
 userID="ssh://${hostName}"
 
 # create host home
@@ -31,17 +27,15 @@ chmod 700 "${GNUPGHOME_HOST}"
 
 log verbose "importing ssh key..."
 # translate ssh key to a private key
-PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" <"$keyFile" \
+PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
     | gpg_host --import
 
-# load the new host fpr into the fpr variable
+# load the new host fpr into the fpr variable.  this is so we can
+# create the gpg pub key file.  we have to do this from the secret key
+# ring since we obviously don't have the gpg pub key file yet, since
+# that's what we're trying to produce (see below).
 load_fingerprint_secret
 
-# export the host public key to the monkeysphere ssh pub key file
-log debug "creating ssh public key file..."
-ssh-keygen -y -f "$keyFile" > "$HOST_KEY_PUB"
-log info "SSH host public key file: $HOST_KEY_PUB"
-
 # export to gpg public key to file
 create_gpg_pub_file
 
-- 
cgit v1.2.3