diff options
Diffstat (limited to 'man/man1')
| -rw-r--r-- | man/man1/monkeysphere.1 | 6 | ||||
| -rw-r--r-- | man/man1/pem2openpgp.1 | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 5badaa9..1c9217f 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -182,8 +182,10 @@ User monkeysphere config file. System-wide monkeysphere config file. .TP ~/.monkeysphere/authorized_user_ids -OpenPGP user IDs associated with keys that will be checked for -addition to the authorized_keys file. +A list of OpenPGP user IDs, one per line. OpenPGP keys with an +exactly-matching User ID (calculated valid by the designated identity +certifiers), will have any valid authorization-capable keys or subkeys +added to the given user's authorized_keys file. .SH AUTHOR diff --git a/man/man1/pem2openpgp.1 b/man/man1/pem2openpgp.1 index 45fd1ee..5622bd7 100644 --- a/man/man1/pem2openpgp.1 +++ b/man/man1/pem2openpgp.1 @@ -29,11 +29,19 @@ The following environment variables influence the behavior of .ti 3 \fBPEM2OPENPGP_TIMESTAMP\fP controls the timestamp (measured in seconds since the UNIX epoch) indicated as the creation time (a.k.a -"not valid before") of the generated certificate. By default, +"not valid before") of the generated certificate (self-signature) and +the key itself. By default, .Nm uses the current time. .Pp .ti 3 +\fBPEM2OPENPGP_KEY_TIMESTAMP\fP controls the timestamp (measured in +seconds since the UNIX epoch) indicated as the creation time of just +the key itself (not the self-signature). By default, +.Nm +uses the value from PEM2OPENPGP_TIMESTAMP. +.Pp +.ti 3 \fBPEM2OPENPGP_USAGE_FLAGS\fP should contain a comma-separated list of valid OpenPGP usage flags (see section 5.2.3.21 of RFC 4880 for what these mean). The available choices are: certify, sign, encrypt_comms, |