X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fimport_key;h=0f362b8ce8aff7f1c95d8b56da9b9b3e963ce6ee;hb=638a70f020f4ccda3deb15e5c697d384e0f705d7;hp=6a897b6122ff9caed1c2c7fe300842e3311b9101;hpb=f728df69bbb04ed21a437832c486590cc5a83684;p=monkeysphere.git

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 6a897b6..0f362b8 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -8,41 +8,53 @@
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008-2009 and are all released under the GPL,
+# They are Copyright 2008-2010 and are all released under the GPL,
 # version 3 or later.
 
 import_key() {
 
-local hostName
-local userID
-local fingerprint
+local keyFile="$1"
+local serviceName="$2"
 
-# check for presence 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."
+# check that key file specified
+if [ -z "$keyFile" ] ; then
+    failure "Must specify PEM-encoded key file to import, or specify '-' for stdin."
+fi
 
-hostName=${1:-$(hostname -f)}
+# fail if hostname not specified
+if [ -z "$serviceName" ] ; then
+    failure "You must specify a service name for use in the OpenPGP certificate user ID."
+fi
 
-userID="ssh://${hostName}"
+# test that a key with that user ID does not already exist
+prompt_userid_exists "$serviceName"
 
-# create host home
-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
+# check that the service name is well formatted
+check_service_name "$serviceName"
 
-# find the key fingerprint of the newly converted key
-HOST_FINGERPRINT=$(fingerprint_host_key)
-export HOST_FINGERPRINT
-
-# export public key to file
-gpg_host_export_to_ssh_file
+# create host home
+mkdir -p "${MHDATADIR}"
+mkdir -p "${GNUPGHOME_HOST}"
+chmod 700 "${GNUPGHOME_HOST}"
+
+# import pem-encoded key to an OpenPGP private key
+if [ "$keyFile" = '-' ] ; then
+    log verbose "importing key from stdin..."
+    PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$serviceName" \
+	| gpg_host --import
+else
+    log verbose "importing key from file '$keyFile'..."
+    PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$serviceName" \
+	<"$keyFile" \
+	| gpg_host --import
+fi
+
+# export to OpenPGP public key to file
+update_pgp_pub_file
+
+log info "host key imported:"
 
 # show info about new key
-show_key
+show_key "$serviceName"
 
 }