MFC: r312825

Merge OpenSSL 1.0.2k.

1 files changed, 18 insertions, 14 deletions

diff --git a/secure/usr.bin/openssl/man/ocsp.1 b/secure/usr.bin/openssl/man/ocsp.1
index 7c8555f..1394711 100644
--- a/secure/usr.bin/openssl/man/ocsp.1
+++ b/secure/usr.bin/openssl/man/ocsp.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\"
 .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
 .\" Fear.  Run.  Save yourself.  No user-serviceable parts.
@@ -133,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OCSP 1"
-.TH OCSP 1 "2016-09-26" "1.0.2j" "OpenSSL"
+.TH OCSP 1 "2017-01-26" "1.0.2k" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -162,6 +158,7 @@ ocsp \- Online Certificate Status Protocol utility
 [\fB\-no_nonce\fR]
 [\fB\-url \s-1URL\s0\fR]
 [\fB\-host host:n\fR]
+[\fB\-header name value\fR]
 [\fB\-path\fR]
 [\fB\-CApath dir\fR]
 [\fB\-CAfile file\fR]
@@ -255,6 +252,13 @@ specify the responder \s-1URL.\s0 Both \s-1HTTP\s0 and \s-1HTTPS \s0(\s-1SSL/TLS
 if the \fBhost\fR option is present then the \s-1OCSP\s0 request is sent to the host
 \&\fBhostname\fR on port \fBport\fR. \fBpath\fR specifies the \s-1HTTP\s0 path name to use
 or \*(L"/\*(R" by default.
+.IP "\fB\-header name value\fR" 4
+.IX Item "-header name value"
+If sending a request to an \s-1OCSP\s0 server, then the specified header name and
+value are added to the \s-1HTTP\s0 request.  Note that the \fBname\fR and \fBvalue\fR must
+be specified as two separate parameters, not as a single quoted string, and
+that the header name does not have the trailing colon.
+Some \s-1OCSP\s0 responders require a Host header; use this flag to provide it.
 .IP "\fB\-timeout seconds\fR" 4
 .IX Item "-timeout seconds"
 connection timeout to the \s-1OCSP\s0 responder in seconds