summaryrefslogtreecommitdiff
path: root/src/share/mh/import_key
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-12 13:25:35 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-12 13:25:35 -0500
commitc4f049f6a8dfd1e0e301a6abffafb5c0012ccc0e (patch)
tree8c625494bd188940cd10f7b640195e3bd8eaf12d /src/share/mh/import_key
parentd71cf8d24bd9357a016b1ead375a67ccd955c130 (diff)
break out a bunch of common functions in monkeysphere-host:
- create_*_*_file to create the key files - load_*fingerprint to load the host fingerprint into an exported variable (HOST_FINGERPRINT) - check_host_*key to check for the presence of a host key modified {import,gen}_key to use these new functions.
Diffstat (limited to 'src/share/mh/import_key')
-rw-r--r--src/share/mh/import_key13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 99511a8..9be8dce 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -16,10 +16,6 @@ import_key() {
local hostName
local userID
-# check for presense of a key
-[ "$HOST_FINGERPRINT" ] && \
- failure "An OpenPGP host key already exists."
-
hostName=${1:-$(hostname -f)}
userID="ssh://${hostName}"
@@ -33,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=$(get_host_fingerprint)
-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