From e52ac3afa0f25f2dfd3e7dde6e1c7c311636f5f0 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 25 May 2009 15:02:58 -0400 Subject: break out signature timestamp from key timestamp, allow them to be set independently. --- man/man1/pem2openpgp.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'man/man1') 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, -- cgit v1.2.3 From eb815bce0da27a24ad718c31b77e45032e3a5916 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 6 Jul 2009 20:55:12 -0400 Subject: describe authorized_user_ids more clearly in man pages. --- man/man1/monkeysphere.1 | 6 ++++-- man/man8/monkeysphere-authentication.8 | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'man/man1') 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/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index 811e47a..d3d3b95 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -169,6 +169,12 @@ System monkeysphere-authentication config file. .TP /var/lib/monkeysphere/authorized_keys/USER Monkeysphere-generated user authorized_keys files. +.TP +~/.monkeysphere/authorized_user_ids +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 -- cgit v1.2.3