projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix the su_monkeysphere_user function so that it does 'bash -c' instead of 'eval...
[monkeysphere.git]
/
src
/
share
/
mh
/
import_key
diff --git
a/src/share/mh/import_key
b/src/share/mh/import_key
index 6a897b6122ff9caed1c2c7fe300842e3311b9101..9be8dce5ba9256d5355ecba07e348a3bf4d3ac59 100644
(file)
--- a/
src/share/mh/import_key
+++ b/
src/share/mh/import_key
@@
-15,12
+15,6
@@
import_key() {
local hostName
local userID
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)}
hostName=${1:-$(hostname -f)}
@@
-35,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=$(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
# show info about new key
show_key