projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
break out a bunch of common functions in monkeysphere-host:
[monkeysphere.git]
/
src
/
share
/
mh
/
import_key
diff --git
a/src/share/mh/import_key
b/src/share/mh/import_key
index 99511a86095ef9f806a6aaa8b58052867c0f047a..9be8dce5ba9256d5355ecba07e348a3bf4d3ac59 100644
(file)
--- a/
src/share/mh/import_key
+++ b/
src/share/mh/import_key
@@
-16,10
+16,6
@@
import_key() {
local hostName
local userID
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}"
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
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
# show info about new key
show_key