The branch master has been updated
via 673e0bbbe4b9cbd19a247c0b18c171bb0421915a (commit)
from 5e9072ed99971fa5e47326c2f8ffa4bc9624a584 (commit)
- Log -----------------------------------------------------------------
commit 673e0bbbe4b9cbd19a247c0b18c171bb0421915a
Author: Dmitry Belyavskiy <[email protected]>
Date: Fri Jan 4 20:38:29 2019 +0300
Restore compatibility with GOST2001 implementations.
Reviewed-by: Tim Hudson <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/7985)
-----------------------------------------------------------------------
Summary of changes:
ssl/statem/extensions.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index c549218..ffa4b46 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
