[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  a2c911c2d069b5c6f9e2a8f20764de83a82b1c99 (commit)
      from  9293046fb447b1fd0ef1753017d9db4c3c333860 (commit)


- Log -----------------------------------------------------------------
commit a2c911c2d069b5c6f9e2a8f20764de83a82b1c99
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Fri Mar 5 18:50:37 2021 +0100

    Restore GOST macros compatibility with 1.1.1
    
    Fixes #14440
    
    Before IANA assigned the official codes for the GOST signature
    algorithms in TLS, the values from the Reserved for Private Use range
    were in use in Russia. The old values were renamed.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14448)

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/tls1.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index f8e3e9ca0d..10332997de 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -1121,6 +1121,11 @@ int SSL_CTX_set_tlsext_ticket_key_evp_cb
 # define TLS_CT_GOST12_LEGACY_SIGN       238
 # define TLS_CT_GOST12_LEGACY_512_SIGN   239
 
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+#  define TLS_CT_GOST12_SIGN TLS_CT_GOST12_LEGACY_SIGN
+#  define TLS_CT_GOST12_512_SIGN TLS_CT_GOST12_LEGACY_512_SIGN
+# endif
+
 /*
  * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
  * comment there)