projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
share
/
mh
/
import_key
diff --git
a/src/share/mh/import_key
b/src/share/mh/import_key
index ed6ee4f1805c127f1c5866b43be0ddb3625c5530..557bb7faaee6712942bfe5bdd0eb5b195013c505 100644
(file)
--- a/
src/share/mh/import_key
+++ b/
src/share/mh/import_key
@@
-46,7
+46,7
@@
chmod 700 "${GNUPGHOME_HOST}"
log verbose "importing ssh key..."
# translate ssh key to a private key
PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
log verbose "importing ssh key..."
# translate ssh key to a private key
PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
- | gpg_host --import
+ | gpg_host --import
2>&1 | log debug
# load the new host fpr into the fpr variable. this is so we can
# create the gpg pub key file. we have to do this from the secret key
# load the new host fpr into the fpr variable. this is so we can
# create the gpg pub key file. we have to do this from the secret key
@@
-54,14
+54,10
@@
PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
# that's what we're trying to produce (see below).
load_fingerprint_secret
# that's what we're trying to produce (see below).
load_fingerprint_secret
-# set ultimate owner trust on the newly imported key
-printf "%s:6:\n" "$HOST_FINGERPRINT" | gpg_host --import-ownertrust
-
-# update trustdb
-gpg_host --check-trustdb
-
# export to gpg public key to file
# export to gpg public key to file
-create_gpg_pub_file
+update_gpg_pub_file
+
+log info "host key imported:"
# show info about new key
show_key
# show info about new key
show_key