[openssl] openssl-3.0 update
beldmit at gmail.com
beldmit at gmail.com
Mon Nov 29 15:30:54 UTC 2021
The branch openssl-3.0 has been updated
via 09e1818a54cad2d348138427234660fcabae793e (commit)
from 91b749a2726351aa5fb37db7064a9104df074c9b (commit)
- Log -----------------------------------------------------------------
commit 09e1818a54cad2d348138427234660fcabae793e
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date: Sun Nov 28 10:21:21 2021 +0100
No EtM for GOST ciphers in TLS 1.2
Reviewed-by: Paul Dale <pauli at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17150)
(cherry picked from commit d724da69389196cdb9ef8db036656882fbc5a6ab)
-----------------------------------------------------------------------
Summary of changes:
ssl/statem/extensions_clnt.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index b38c9ca684..4cd7affe23 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -1678,7 +1678,11 @@ int tls_parse_stoc_etm(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
/* Ignore if inappropriate ciphersuite */
if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC)
&& s->s3.tmp.new_cipher->algorithm_mac != SSL_AEAD
- && s->s3.tmp.new_cipher->algorithm_enc != SSL_RC4)
+ && s->s3.tmp.new_cipher->algorithm_enc != SSL_RC4
+ && s->s3.tmp.new_cipher->algorithm_enc != SSL_eGOST2814789CNT
+ && s->s3.tmp.new_cipher->algorithm_enc != SSL_eGOST2814789CNT12
+ && s->s3.tmp.new_cipher->algorithm_enc != SSL_MAGMA
+ && s->s3.tmp.new_cipher->algorithm_enc != SSL_KUZNYECHIK)
s->ext.use_etm = 1;
return 1;
More information about the openssl-commits
mailing list