X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=f222130f81c7fbfacaf2c52bb94a0ddcaa50d7fd;hb=9cb9336f3d9ab42b6f32f71e3c5e137b2c699dba;hp=560d249867d780183f9b070ed341c099bf948963;hpb=b92675786ac883551528b3870c71c98066d60c0f;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 560d249..f222130 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -31,10 +31,12 @@ usage: $PGRM <subcommand> [args]
 MonkeySphere server admin tool.
 
 subcommands:
-  update-users (s) [USER]...            update users authorized_keys files
   gen-key (g) [HOSTNAME]                generate gpg key for the server
+  show-fingerprint (f)                  show server's host key fingerprint
   publish-key (p)                       publish server key to keyserver
   trust-keys (t) KEYID...               mark keyids as trusted
+
+  update-users (s) [USER]...            update users authorized_keys files
   update-user-userids (u) USER UID...   add/update user IDs for a user
   remove-user-userids (r) USER UID...   remove user IDs for a user
   help (h,?)                            this help
@@ -51,7 +53,7 @@ gen_key() {
     # set key defaults
     KEY_TYPE=${KEY_TYPE:-"RSA"}
     KEY_LENGTH=${KEY_LENGTH:-"2048"}
-    KEY_USAGE=${KEY_USAGE:-"auth,encrypt"}
+    KEY_USAGE=${KEY_USAGE:-"auth"}
     cat <<EOF
 Please specify how long the key should be valid.
          0 = key does not expire
@@ -76,6 +78,9 @@ EOF
 )
 
     # add the revoker field if requested
+# FIXME: the 1: below assumes that $REVOKER's key is an RSA key.  why?
+# FIXME: why is this marked "sensitive"?  how will this signature ever
+# be transmitted to the expected revoker?
     if [ "$REVOKER" ] ; then
 	keyParameters="${keyParameters}"$(cat <<EOF
 
@@ -106,7 +111,12 @@ EOF
 
     log -n "generating server key... "
     echo "$keyParameters" | gpg --batch --gen-key
-    loge "done."
+    log "done."
+    fingerprint_server_key
+}
+
+fingerprint_server_key() {
+    gpg --fingerprint --list-secret-keys =ssh://$(hostname --fqdn)
 }
 
 ########################################################################
@@ -195,6 +205,10 @@ case $COMMAND in
 	gen_key "$1"
 	;;
 
+    'show-fingerprint'|'f')
+	fingerprint_server_key
+	;;
+
     'publish-key'|'p')
 	publish_server_key
 	;;