merging from jrollins

[monkeysphere.git] / src / subcommands / mh / gen-key

diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key
index 554c04c5a8a43ccc1cffe2290cff7e80448fad47..8558441a9499b00bcf9750ef56dadeb274cc841c 100755 (executable)
--- 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
@@ -36,10 +35,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'.
@@ -65,15 +60,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"
 
@@ -113,4 +99,4 @@ gpg_authentication "--export-options export-minimal --armor --export 0x${fingerp
 log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
 
 # show info about new key
-show_server_key
+show_key