diff options
Diffstat (limited to 'src/subcommands/mh')
-rwxr-xr-x | src/subcommands/mh/add-hostname | 3 | ||||
-rwxr-xr-x | src/subcommands/mh/gen-key | 4 | ||||
-rwxr-xr-x | src/subcommands/mh/import-key | 4 | ||||
-rwxr-xr-x | src/subcommands/mh/revoke-hostname | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/subcommands/mh/add-hostname b/src/subcommands/mh/add-hostname index 7726a29..591f52e 100755 --- a/src/subcommands/mh/add-hostname +++ b/src/subcommands/mh/add-hostname @@ -60,9 +60,6 @@ EOF if echo "$adduidCommand" | \ gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then - # update the trustdb for the authentication keyring - gpg_authentication "--check-trustdb" - show_key echo diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key index 8558441..72b9138 100755 --- a/src/subcommands/mh/gen-key +++ b/src/subcommands/mh/gen-key @@ -10,6 +10,8 @@ # They are Copyright 2008, and are all released under the GPL, version 3 # or later. +gen_key() { + local keyType="RSA" local keyLength="2048" local keyUsage="auth" @@ -100,3 +102,5 @@ log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pu # show info about new key show_key + +} diff --git a/src/subcommands/mh/import-key b/src/subcommands/mh/import-key index ac67711..9ba51d2 100755 --- a/src/subcommands/mh/import-key +++ b/src/subcommands/mh/import-key @@ -10,6 +10,8 @@ # They are Copyright 2008, and are all released under the GPL, version 3 # or later. +import_key() { + local hostName=$(hostname -f) local keyFile="/etc/ssh/ssh_host_rsa_key" local keyExpire @@ -82,3 +84,5 @@ log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pu # show info about new key show_key + +} diff --git a/src/subcommands/mh/revoke-hostname b/src/subcommands/mh/revoke-hostname index 0a773a3..01f6ee0 100755 --- a/src/subcommands/mh/revoke-hostname +++ b/src/subcommands/mh/revoke-hostname @@ -78,9 +78,6 @@ EOF if echo "$revuidCommand" | \ gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then - # update the trustdb for the authentication keyring - gpg_authentication "--check-trustdb" - show_key echo |