diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-06-14 11:40:31 +0200 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2021-06-15 22:14:34 +0200 |
| commit | 4832560be3b2a709557497cd881f8c390ba7ec34 (patch) | |
| tree | 19277b7328dcc0c3b3365f6e7ec2cef242ded61c /apps | |
| parent | 835dd706d3a916dacdb302905899a32638ed8adc (diff) | |
| download | openssl-4832560be3b2a709557497cd881f8c390ba7ec34.zip openssl-4832560be3b2a709557497cd881f8c390ba7ec34.tar.gz openssl-4832560be3b2a709557497cd881f8c390ba7ec34.tar.bz2 | |
Disabling Encrypt-then-MAC extension in s_client/s_server
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15735)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/include/opt.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/include/opt.h b/apps/include/opt.h index b77c5a5..96e78e4 100644 --- a/apps/include/opt.h +++ b/apps/include/opt.h @@ -163,7 +163,7 @@ OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, OPT_S_CIPHERSUITES, \ OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP, \ OPT_S_MINPROTO, OPT_S_MAXPROTO, \ - OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S__LAST + OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S_NO_ETM, OPT_S__LAST # define OPT_S_OPTIONS \ OPT_SECTION("TLS/SSL"), \ @@ -216,7 +216,9 @@ {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \ "Perform all sorts of protocol violations for testing purposes"}, \ {"no_middlebox", OPT_S_NO_MIDDLEBOX, '-', \ - "Disable TLSv1.3 middlebox compat mode" } + "Disable TLSv1.3 middlebox compat mode" }, \ + {"no_etm", OPT_S_NO_ETM, '-', \ + "Disable Encrypt-then-Mac extension"} # define OPT_S_CASES \ OPT_S__FIRST: case OPT_S__LAST: break; \ @@ -250,7 +252,8 @@ case OPT_S_MINPROTO: \ case OPT_S_MAXPROTO: \ case OPT_S_DEBUGBROKE: \ - case OPT_S_NO_MIDDLEBOX + case OPT_S_NO_MIDDLEBOX: \ + case OPT_S_NO_ETM #define IS_NO_PROT_FLAG(o) \ (o == OPT_S_NOSSL3 || o == OPT_S_NOTLS1 || o == OPT_S_NOTLS1_1 \ |