diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/man1/openpgp2ssh.1 | 18 | ||||
| -rw-r--r-- | man/man8/monkeysphere-server.8 | 25 |
2 files changed, 24 insertions, 19 deletions
diff --git a/man/man1/openpgp2ssh.1 b/man/man1/openpgp2ssh.1 index bea1da5..6141ec5 100644 --- a/man/man1/openpgp2ssh.1 +++ b/man/man1/openpgp2ssh.1 @@ -19,11 +19,14 @@ SSH-style key on standard output. .Pp If the data on standard input contains no subkeys, you can invoke .Nm -without arguments. If the data on standard input contains -multiple keys (e.g. a primary key and associated subkeys), you must -specify a specific OpenPGP keyid (e.g. CCD2ED94D21739E9) or -fingerprint as the first argument to indicate which key to export. -The keyid must be exactly 16 hex characters. +without arguments. If the data on standard input contains multiple +keys (e.g. a primary key and associated subkeys), you must specify a +specific OpenPGP key identifier as the first argument to indicate +which key to export. The key ID is normally the 40 hex digit OpenPGP +fingerprint of the key or subkey desired, but +.Nm +will accept as few as the last 8 digits of the fingerprint as a key +ID. .Pp If the input contains an OpenPGP RSA or DSA public key, it will be converted to the OpenSSH-style single-line keystring, prefixed with @@ -78,8 +81,9 @@ Secret key output is currently not passphrase-protected. .Nm currently cannot handle passphrase-protected secret keys on input. .Pp -It would be nice to be able to use keyids shorter or longer than 16 -hex characters. +Key identifiers consisting of an odd number of hex digits are not +accepted. Users who use a key ID with a standard length of 8, 16, or +40 hex digits should not be affected by this. .Pp .Nm only acts on keys associated with the first primary key diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8 index e821e63..9bb7b2d 100644 --- a/man/man8/monkeysphere-server.8 +++ b/man/man8/monkeysphere-server.8 @@ -28,8 +28,8 @@ file are processed, and the user's authorized_keys file in /var/cache/monkeysphere/authorized_keys/USER. See `man monkeysphere' for more info. If the USER_CONTROLLED_AUTHORIZED_KEYS variable is set, then a user-controlled authorized_keys file (usually -~USER/.ssh/authorized_keys) is added to the authorized_keys file. `k' -may be used in place of `update-known_hosts'. +~USER/.ssh/authorized_keys) is added to the authorized_keys file. `u' +may be used in place of `update-users. .TP .B gen-key Generate a gpg key for the host. `g' may be used in place of @@ -63,12 +63,12 @@ that is done, publish the key to a keyserver with "publish-key" subcommand. Finally, you need to modify the sshd_config to tell sshd where the new server host key: -HostKey /etc/monkeysphere/ssh_host_rsa_key +HostKey /var/lib/monkeysphere/ssh_host_rsa_key If the server will also handle user authentication through monkeysphere-generated authorized_keys files, set the following: -AuthorizedKeysFile /var/cache/monkeysphere/authorized_keys/%u +AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u Once those changes are made, restart the ssh server. @@ -81,17 +81,18 @@ System monkeysphere-server config file. /etc/monkeysphere/monkeysphere.conf System-wide monkeysphere config file. .TP -/etc/monkeysphere/gnupg -Monkeysphere GNUPG home directory. +/var/lib/monkeysphere/authorized_keys/USER +Monkeysphere-generated user authorized_keys files. .TP -/etc/monkeysphere/ssh_host_rsa_key -Copy of the host's private key in ssh format, suitable for use by sshd. +/var/lib/monkeysphere/ssh_host_rsa_key +Copy of the host's private key in ssh format, suitable for use by +sshd. .TP -/etc/monkeysphere/authorized_user_ids/USER -Server maintained authorized_user_ids files for users. +/var/lib/monkeysphere/gnupg-host +Monkeysphere host GNUPG home directory. .TP -/var/cache/monkeysphere/authorized_keys/USER -User authorized_keys file. +/var/lib/monkeysphere/gnupg-authentication +Monkeysphere authentication GNUPG home directory. .SH AUTHOR |