diff options
| author | Matt Caswell <matt@openssl.org> | 2018-09-12 17:11:10 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-09-13 10:10:13 +0100 |
| commit | 76864436b35e7aec867d85b967e9d6c0d7294c53 (patch) | |
| tree | 8284dd0b61e7d546fe16927a6d5b5de0dc456636 /apps | |
| parent | 3e9a0eb2c86641f5777dcbd8a51d7643f8c71540 (diff) | |
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: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7206)
(cherry picked from commit 6ef40f1fc08f0c4ffb08438d63eed83eae7eb2b8)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index e3bb1a672d..6f2a2ae8e2 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1622,6 +1622,11 @@ int s_server_main(int argc, char *argv[]) goto end; } #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 if (protocol == IPPROTO_SCTP) { |