summaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
Diffstat (limited to 'src/share')
-rw-r--r--src/share/common6
-rw-r--r--src/share/mh/gen_key6
-rw-r--r--src/share/mh/import_key3
3 files changed, 2 insertions, 13 deletions
diff --git a/src/share/common b/src/share/common
index ef931ca..9adae05 100644
--- a/src/share/common
+++ b/src/share/common
@@ -533,12 +533,6 @@ gpg_fetch_userid() {
--search ="$userID" > /dev/null 2>&1
returnCode="$?"
- # if the user is the monkeysphere user, then update the
- # monkeysphere user's trustdb
- if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
- gpg_authentication "--check-trustdb" > /dev/null 2>&1
- fi
-
return "$returnCode"
}
diff --git a/src/share/mh/gen_key b/src/share/mh/gen_key
index aad213a..162a64e 100644
--- a/src/share/mh/gen_key
+++ b/src/share/mh/gen_key
@@ -85,10 +85,6 @@ echo "$keyParameters" | gpg_host --batch --gen-key
# find the key fingerprint of the newly generated key
fingerprint=$(fingerprint_server_key)
-# export host ownertrust to authentication keyring
-log verbose "setting ultimate owner trust for host key..."
-echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
-
# translate the private key to ssh format, and export to a file
# for sshs usage.
# NOTE: assumes that the primary key is the proper key to use
@@ -98,7 +94,7 @@ echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
log info "SSH host private key output to file: ${SYSDATADIR}/ssh_host_rsa_key"
ssh-keygen -y -f "${SYSDATADIR}/ssh_host_rsa_key" > "${SYSDATADIR}/ssh_host_rsa_key.pub"
log info "SSH host public key output to file: ${SYSDATADIR}/ssh_host_rsa_key.pub"
-gpg_authentication "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
# show info about new key
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 386e02d..c0d5956 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -77,10 +77,9 @@ fingerprint=$(fingerprint_server_key)
# export host ownertrust to authentication keyring
log verbose "setting ultimate owner trust for host key..."
echo "${fingerprint}:6:" | gpg_host "--import-ownertrust"
-echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
# export public key to file
-gpg_authentication "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
+gpg_host "--export-options export-minimal --armor --export 0x${fingerprint}\!" > "${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
# show info about new key