Forbid to specify -nextprotoneg if -tls1_3 is enabled
authorPaul Yang <paulyang.inf@gmail.com>
Fri, 16 Jun 2017 10:12:02 +0000 (18:12 +0800)
committerRich Salz <rsalz@openssl.org>
Fri, 16 Jun 2017 21:00:22 +0000 (17:00 -0400)
commit837f87c217fd595c814c4e1ab47ec1842d29b60d
tree06f5a526fb5715cf9eeb8d0811d793fb31b59b10
parent6ea3bca427b3e759939a63555821d0c4678dd79c
Forbid to specify -nextprotoneg if -tls1_3 is enabled

This applies both to s_client and s_server app.

Reaction to Issue #3665.

Signed-off-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3697)
apps/s_client.c
apps/s_server.c
doc/man1/s_client.pod
doc/man1/s_server.pod