提交 76864436 编写于 作者: M Matt Caswell

Don't allow -early_data with other options where it doesn't work

-early_data is not compatible with -www, -WWW, -HTTP or -rev.

Fixes #7200
Reviewed-by: NTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7206)

(cherry picked from commit 6ef40f1fc08f0c4ffb08438d63eed83eae7eb2b8)
上级 3e9a0eb2
...@@ -1622,6 +1622,11 @@ int s_server_main(int argc, char *argv[]) ...@@ -1622,6 +1622,11 @@ int s_server_main(int argc, char *argv[])
goto end; goto end;
} }
#endif #endif
if (early_data && (www > 0 || rev)) {
BIO_printf(bio_err,
"Can't use -early_data in combination with -www, -WWW, -HTTP, or -rev\n");
goto end;
}
#ifndef OPENSSL_NO_SCTP #ifndef OPENSSL_NO_SCTP
if (protocol == IPPROTO_SCTP) { if (protocol == IPPROTO_SCTP) {
......
...@@ -405,13 +405,14 @@ Inhibit printing of session and certificate information. ...@@ -405,13 +405,14 @@ Inhibit printing of session and certificate information.
Sends a status message back to the client when it connects. This includes Sends a status message back to the client when it connects. This includes
information about the ciphers used and various session parameters. information about the ciphers used and various session parameters.
The output is in HTML format so this option will normally be used with a The output is in HTML format so this option will normally be used with a
web browser. web browser. Cannot be used in conjunction with B<-early_data>.
=item B<-WWW> =item B<-WWW>
Emulates a simple web server. Pages will be resolved relative to the Emulates a simple web server. Pages will be resolved relative to the
current directory, for example if the URL https://myhost/page.html is current directory, for example if the URL https://myhost/page.html is
requested the file ./page.html will be loaded. requested the file ./page.html will be loaded. Cannot be used in conjunction
with B<-early_data>.
=item B<-tlsextdebug> =item B<-tlsextdebug>
...@@ -423,7 +424,8 @@ Emulates a simple web server. Pages will be resolved relative to the ...@@ -423,7 +424,8 @@ Emulates a simple web server. Pages will be resolved relative to the
current directory, for example if the URL https://myhost/page.html is current directory, for example if the URL https://myhost/page.html is
requested the file ./page.html will be loaded. The files loaded are requested the file ./page.html will be loaded. The files loaded are
assumed to contain a complete and correct HTTP response (lines that assumed to contain a complete and correct HTTP response (lines that
are part of the HTTP response line and headers must end with CRLF). are part of the HTTP response line and headers must end with CRLF). Cannot be
used in conjunction with B<-early_data>.
=item B<-id_prefix val> =item B<-id_prefix val>
...@@ -488,7 +490,8 @@ output. ...@@ -488,7 +490,8 @@ output.
=item B<-rev> =item B<-rev>
Simple test server which just reverses the text received from the client Simple test server which just reverses the text received from the client
and sends it back to the server. Also sets B<-brief>. and sends it back to the server. Also sets B<-brief>. Cannot be used in
conjunction with B<-early_data>.
=item B<-async> =item B<-async>
...@@ -711,7 +714,8 @@ greater than or equal to 0. ...@@ -711,7 +714,8 @@ greater than or equal to 0.
=item B<-early_data> =item B<-early_data>
Accept early data where possible. Accept early data where possible. Cannot be used in conjunction with B<-www>,
B<-WWW>, B<-HTTP> or B<-rev>.
=item B<-anti_replay>, B<-no_anti_replay> =item B<-anti_replay>, B<-no_anti_replay>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册