diff options
| -rwxr-xr-x | src/monkeysphere-host | 12 | ||||
| -rwxr-xr-x | src/subcommands/mh/gen-key | 14 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host index 7ba0700..31f031e 100755 --- a/src/monkeysphere-host +++ b/src/monkeysphere-host @@ -20,11 +20,6 @@ export SYSSHAREDIR SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere/host"} export SYSDATADIR -# monkeysphere temp directory, in sysdatadir to enable atomic moves of -# authorized_keys files -MSTMPDIR="${SYSDATADIR}/tmp" -export MSTMPDIR - # UTC date in ISO 8601 format if needed DATE=$(date -u '+%FT%T') @@ -53,15 +48,12 @@ subcommands: publish-key (p) publish server host key to keyserver expert - import-key (i) import existing ssh key to gpg - --hostname (-h) NAME[:PORT] hostname for key user ID + import-key (i) [NAME[:PORT]] import existing ssh key to gpg --keyfile (-f) FILE key file to import --expire (-e) EXPIRE date to expire - gen-key (g) generate gpg key for the host - --hostname (-h) NAME[:PORT] hostname for key user ID + gen-key (g) [NAME[:PORT]] generate gpg key for the host --length (-l) BITS key length in bits (2048) --expire (-e) EXPIRE date to expire - --revoker (-r) FINGERPRINT add a revoker diagnostics (d) monkeysphere host status version (v) show version number diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key index da2e40d..9f26087 100755 --- a/src/subcommands/mh/gen-key +++ b/src/subcommands/mh/gen-key @@ -14,7 +14,6 @@ local keyType="RSA" local keyLength="2048" local keyUsage="auth" local keyExpire -local revoker local hostName=$(hostname -f) local userID local keyParameters @@ -40,10 +39,6 @@ while true ; do keyExpire="$2" shift 2 ;; - -r|--revoker) - revoker="$2" - shift 2 - ;; *) if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then failure "Unknown option '$1'. @@ -67,15 +62,6 @@ Key-Usage: $keyUsage Name-Real: $userID Expire-Date: $keyExpire" -# add the revoker field if specified -# FIXME: the "1:" below assumes that $REVOKER's key is an RSA key. -# FIXME: key is marked "sensitive"? is this appropriate? -if [ "$revoker" ] ; then - keyParameters=\ -"${keyParameters} -Revoker: 1:${revoker} sensitive" -fi - echo "The following key parameters will be used for the host private key:" echo "$keyParameters" |