From: Rich Salz <rsalz@akamai.com>
Date: Fri, 24 Jan 2020 17:33:05 +0000 (-0500)
Subject: Fix "ts" no-XXX options, document two TLS options
X-Git-Tag: openssl-3.0.0-alpha1~578
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e16083ff526d6d38de519620747aabbfc69b83;p=thirdparty%2Fopenssl.git

Fix "ts" no-XXX options, document two TLS options

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10191)
---

diff --git a/doc/man1/openssl-ts.pod.in b/doc/man1/openssl-ts.pod.in
index b9e911827d1..f115f450724 100644
--- a/doc/man1/openssl-ts.pod.in
+++ b/doc/man1/openssl-ts.pod.in
@@ -50,7 +50,9 @@ B<-verify>
 [B<-queryfile> I<request.tsq>]
 [B<-in> I<response.tsr>]
 [B<-token_in>]
-{- $OpenSSL::safe::opt_trust_synopsis -}
+[B<-CAfile> I<file>]
+[B<-CApath> I<dir>]
+[B<-CAstore> I<uri>]
 {- $OpenSSL::safe::opt_v_synopsis -}
 
 =for openssl ifdef engine
@@ -330,8 +332,9 @@ certificate. This file must contain the TSA signing certificate and
 all intermediate CA certificates unless the response includes them.
 (Optional)
 
-{- $OpenSSL::safe::opt_trust_item -}
+=item B<-CAfile> I<file>, B<-CApath> I<dir>, B<-CAstore> I<uri>
 
+See L<openssl(1)/Trusted Certificate Options> for details.
 At least one of B<-CApath>, B<-CAfile> or B<-CAstore> must be specified.
 
 {- $OpenSSL::safe::opt_v_item -}
diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod
index f1714084df2..1f2e7b8ebbe 100644
--- a/doc/man3/SSL_CONF_cmd.pod
+++ b/doc/man3/SSL_CONF_cmd.pod
@@ -193,8 +193,12 @@ the B<padding> must be >1 or <=16384.
 
 =item B<-debug_broken_protocol>
 
+Ignored.
+
 =item B<-no_middlebox>
 
+Turn off "middlebox compatibility", as described below.
+
 =back
 
 =head2 Additional Options