diff options
| author | yangyangtiantianlonglong <yangtianlong1224@163.com> | 2022-01-26 15:08:05 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-01-28 15:32:58 +0100 |
| commit | a829d53a14eeae2b0bc783b7952b4212cf31d918 (patch) | |
| tree | 031a1987bab62a037ab90cb39c21e36a253be9d4 /ssl/ssl_conf.c | |
| parent | Add -verbose/-queit flags to dhparam (diff) | |
| download | openssl-a829d53a14eeae2b0bc783b7952b4212cf31d918.tar.xz openssl-a829d53a14eeae2b0bc783b7952b4212cf31d918.zip | |
apps: Add option -no_ems to s_client/s_server apps
The option SSL_OP_NO_EXTENDED_MASTER_SECRET was added in #3910.
And it is valid for versions below (D)TLS 1.2.
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17597)
Diffstat (limited to 'ssl/ssl_conf.c')
| -rw-r--r-- | ssl/ssl_conf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index c0cbbe5e2c..9a5fe7171c 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -703,6 +703,7 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = { SSL_CONF_CMD_SWITCH("anti_replay", SSL_CONF_FLAG_SERVER), SSL_CONF_CMD_SWITCH("no_anti_replay", SSL_CONF_FLAG_SERVER), SSL_CONF_CMD_SWITCH("no_etm", 0), + SSL_CONF_CMD_SWITCH("no_ems", 0), SSL_CONF_CMD_STRING(SignatureAlgorithms, "sigalgs", 0), SSL_CONF_CMD_STRING(ClientSignatureAlgorithms, "client_sigalgs", 0), SSL_CONF_CMD_STRING(Curves, "curves", 0), @@ -794,6 +795,8 @@ static const ssl_switch_tbl ssl_cmd_switches[] = { {SSL_OP_NO_ANTI_REPLAY, 0}, /* no Encrypt-then-Mac */ {SSL_OP_NO_ENCRYPT_THEN_MAC, 0}, + /* no Extended master secret */ + {SSL_OP_NO_EXTENDED_MASTER_SECRET, 0}, }; static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd) |