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

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index cab2cf5..0f362b8 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -8,42 +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 keyFile
-local hostName
-local userID
+local keyFile="$1"
+local serviceName="$2"
 
-keyFile="$1"
-[ -f "$keyFile" ]
+# check that key file specified
+if [ -z "$keyFile" ] ; then
+    failure "Must specify PEM-encoded key file to import, or specify '-' for stdin."
+fi
 
-hostName=${2:-$(hostname -f)}
-userID="ssh://${hostName}"
+# 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
 
-# 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" <"$keyFile" \
-    | gpg_host --import
+# test that a key with that user ID does not already exist
+prompt_userid_exists "$serviceName"
 
-# load the new host fpr into the fpr variable
-load_fingerprint_secret
+# check that the service name is well formatted
+check_service_name "$serviceName"
 
-# 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
+# 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"
 
 }