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

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 6a897b6..9be8dce 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -15,12 +15,6 @@ import_key() {
 
 local hostName
 local userID
-local fingerprint
-
-# 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."
 
 hostName=${1:-$(hostname -f)}
 
@@ -35,12 +29,11 @@ log verbose "importing ssh key..."
 PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" | \
     gpg_host --import
 
-# find the key fingerprint of the newly converted key
-HOST_FINGERPRINT=$(fingerprint_host_key)
-export HOST_FINGERPRINT
+# load the new host fpr into the fpr variable
+load_fingerprint_secret
 
-# export public key to file
-gpg_host_export_to_ssh_file
+# export to gpg public key to file
+create_gpg_pub_file
 
 # show info about new key
 show_key