Stop all creation of a ssh_host_rsa_key.pub. Use openpgp2ssh to get

[monkeysphere.git] / src / share / mh / import_key

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 9415b4d72ec934463f19ed8e77d39d06fdcef0e0..74dc0b3816d7584b2483498238efb6599299896b 100644 (file)
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -17,24 +17,25 @@ local hostName
 local userID
 
 hostName=${1:-$(hostname -f)}
-
 userID="ssh://${hostName}"
 
 # create host home
-mkdir -p "$GNUPGHOME_HOST"
-chmod 700 "$GNUPGHOME_HOST"
+mkdir -p "${MHDATADIR}"
+mkdir -p "${MHTMPDIR}"
+mkdir -p "${GNUPGHOME_HOST}"
+chmod 700 "${GNUPGHOME_HOST}"
 
 log verbose "importing ssh key..."
 # translate ssh key to a private key
-PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" | \
-    gpg_host --import
+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 to ssh public key file
-create_ssh_pub_file
-
 # export to gpg public key to file
 create_gpg_pub_file