From: Dmitry Belyavskiy Date: Mon, 29 Nov 2021 15:37:32 +0000 (+0100) Subject: No EtM for GOST ciphers X-Git-Tag: OpenSSL_1_1_1m~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76eb12aa278cb30a495bcee3fdc176d0a6c35052;p=thirdparty%2Fopenssl.git No EtM for GOST ciphers Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17158) --- diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index 621fcfa561d..9d38ac23b5f 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -1741,7 +1741,9 @@ 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->ext.use_etm = 1; return 1;