From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 16 Feb 2009 04:25:51 +0000 (-0500)
Subject: Change import_key to take the path to the file to import as an argument.  dkg won... 
X-Git-Tag: monkeysphere_0.23~94
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=9f033ac0c9a96acbbc583327026adb37e4d5a8a9

Change import_key to take the path to the file to import as an argument.  dkg won't like this, but I think it's necessary so that we can generate the ssh pub key file, which is needed for subsequenty works.
---

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 9415b4d..cab2cf5 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -13,11 +13,14 @@
 
 import_key() {
 
+local keyFile
 local hostName
 local userID
 
-hostName=${1:-$(hostname -f)}
+keyFile="$1"
+[ -f "$keyFile" ]
 
+hostName=${2:-$(hostname -f)}
 userID="ssh://${hostName}"
 
 # create host home
@@ -26,14 +29,16 @@ 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" <"$keyFile" \
+    | gpg_host --import
 
 # load the new host fpr into the fpr variable
 load_fingerprint_secret
 
-# export to ssh public key file
-create_ssh_pub_file
+# 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