diff options
Diffstat (limited to 'man')
-rw-r--r-- | man/man1/monkeysphere.1 | 2 | ||||
-rw-r--r-- | man/man7/monkeysphere.7 | 7 | ||||
-rw-r--r-- | man/man8/monkeysphere-authentication.8 | 7 | ||||
-rw-r--r-- | man/man8/monkeysphere-host.8 | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 6abd36c..4d8eab6 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -201,7 +201,7 @@ added to the given user's authorized_keys file. .SH AUTHOR Written by: -Jameson Rollins <jrollins@fifthhorseman.net>, +Jameson Rollins <jrollins@finestructure.net>, Daniel Kahn Gillmor <dkg@fifthhorseman.net> .SH SEE ALSO diff --git a/man/man7/monkeysphere.7 b/man/man7/monkeysphere.7 index e4c2bf0..4d1deca 100644 --- a/man/man7/monkeysphere.7 +++ b/man/man7/monkeysphere.7 @@ -1,9 +1,8 @@ -.TH MONKEYSPHERE "7" "March 2009" "monkeysphere" "System Frameworks" +.TH MONKEYSPHERE "7" "March 2010" "monkeysphere" "System Frameworks" .SH NAME -monkeysphere - ssh authentication framework using OpenPGP Web of -Trust +monkeysphere - ssh and TLS authentication framework using OpenPGP Web of Trust .SH DESCRIPTION @@ -75,7 +74,7 @@ https://host.example.com[:port] .SH AUTHOR Written by: -Jameson Rollins <jrollins@fifthhorseman.net>, +Jameson Rollins <jrollins@finestructure.net>, Daniel Kahn Gillmor <dkg@fifthhorseman.net> .SH SEE ALSO diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index b2dfbdf..ea9debd 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -177,6 +177,11 @@ false may expose users to abuse by other users on the system. (true) /etc/monkeysphere/monkeysphere\-authentication.conf System monkeysphere-authentication config file. .TP +/etc/monkeysphere/monkeysphere\-authentication\-x509\-anchors.crt +If monkeysphere-authentication is configured to query an hkps +keyserver, it will use X.509 Certificate Authority certificates in +this file to validate any X.509 certificates used by the keyserver. +.TP /var/lib/monkeysphere/authorized_keys/USER Monkeysphere-generated user authorized_keys files. .TP @@ -189,7 +194,7 @@ added to the given user's authorized_keys file. .SH AUTHOR This man page was written by: -Jameson Rollins <jrollins@fifthhorseman.net>, +Jameson Rollins <jrollins@finestructure.net>, Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Matthew Goins <mjgoins@openflows.com> diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8 index 4735940..00ea777 100644 --- a/man/man8/monkeysphere-host.8 +++ b/man/man8/monkeysphere-host.8 @@ -226,7 +226,7 @@ of all imported secret keys (this is the host's GNUPGHOME directory). .SH AUTHOR This man page was written by: -Jameson Rollins <jrollins@fifthhorseman.net>, +Jameson Rollins <jrollins@finestructure.net>, Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Matthew Goins <mjgoins@openflows.com> |