From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 6 Jul 2014 21:16:21 +0000 (+0100)
Subject: Document certificate status request options.
X-Git-Tag: OpenSSL_1_0_1i~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b197c770a6a6ec3d17d7d310a9b64570f044eca0;p=oweals%2Fopenssl.git

Document certificate status request options.
(cherry picked from commit cba3f1c739f012aaadb85aaefaf8de424d2695e2)

Conflicts:

	doc/apps/s_client.pod
	doc/apps/s_server.pod
---

diff --git a/doc/apps/s_client.pod b/doc/apps/s_client.pod
index 883da15d25..57b67f7c4e 100644
--- a/doc/apps/s_client.pod
+++ b/doc/apps/s_client.pod
@@ -47,6 +47,7 @@ B<openssl> B<s_client>
 [B<-sess_out filename>]
 [B<-sess_in filename>]
 [B<-rand file(s)>]
+[B<-status>]
 
 =head1 DESCRIPTION
 
@@ -259,6 +260,11 @@ Multiple files can be specified separated by a OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.
 
+=item B<-status>
+
+sends a certificate status request to the server (OCSP stapling). The server
+response (if any) is printed out.
+
 =back
 
 =head1 CONNECTED COMMANDS
diff --git a/doc/apps/s_server.pod b/doc/apps/s_server.pod
index b6487b2a80..319622f737 100644
--- a/doc/apps/s_server.pod
+++ b/doc/apps/s_server.pod
@@ -56,6 +56,10 @@ B<openssl> B<s_server>
 [B<-no_ticket>]
 [B<-id_prefix arg>]
 [B<-rand file(s)>]
+[B<-status>]
+[B<-status_verbose>]
+[B<-status_timeout nsec>]
+[B<-status_url url>]
 
 =head1 DESCRIPTION
 
@@ -287,6 +291,25 @@ Multiple files can be specified separated by a OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.
 
+=item B<-status>
+
+enables certificate status request support (aka OCSP stapling).
+
+=item B<-status_verbose>
+
+enables certificate status request support (aka OCSP stapling) and gives
+a verbose printout of the OCSP response.
+
+=item B<-status_timeout nsec>
+
+sets the timeout for OCSP response to B<nsec> seconds.
+
+=item B<-status_url url>
+
+sets a fallback responder URL to use if no responder URL is present in the
+server certificate. Without this option an error is returned if the server
+certificate does not contain a responder address.
+
 =back
 
 =head1 CONNECTED COMMANDS