diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2019-01-04 20:38:29 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-06 10:24:07 +0000 |
| commit | 952d813eeaa6baf01bf25b057f760a6f21147c7e (patch) | |
| tree | 1db568e9a608cec8117ee85881262b4b71c4e9b6 /ssl | |
| parent | 980f7419cb3d7343d4f76ff648f5785b75a2efc4 (diff) | |
Restore compatibility with GOST2001 implementations.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7985)
(cherry picked from commit 673e0bbbe4b9cbd19a247c0b18c171bb0421915a)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/extensions.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 716d6d23e0..11feae5456 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -623,7 +623,12 @@ int tls_collect_extensions(SSL *s, PACKET *packet, unsigned int context, && type != TLSEXT_TYPE_cookie && type != TLSEXT_TYPE_renegotiate && type != TLSEXT_TYPE_signed_certificate_timestamp - && (s->ext.extflags[idx] & SSL_EXT_FLAG_SENT) == 0) { + && (s->ext.extflags[idx] & SSL_EXT_FLAG_SENT) == 0 +#ifndef OPENSSL_NO_GOST + && !((context & SSL_EXT_TLS1_2_SERVER_HELLO) != 0 + && type == TLSEXT_TYPE_cryptopro_bug) +#endif + ) { SSLfatal(s, SSL_AD_UNSUPPORTED_EXTENSION, SSL_F_TLS_COLLECT_EXTENSIONS, SSL_R_UNSOLICITED_EXTENSION); goto err; |