]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Restore GOST macros compatibility with 1.1.1
authorDmitry Belyavskiy <beldmit@gmail.com>
Fri, 5 Mar 2021 17:50:37 +0000 (18:50 +0100)
committerDmitry Belyavskiy <beldmit@gmail.com>
Sat, 6 Mar 2021 20:52:16 +0000 (21:52 +0100)
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@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14448)

include/openssl/tls1.h

index f8e3e9ca0dac648ac0cd0f8b5f6ff47b1239e01c..10332997de03209558408433b8aac86cfef04c90 100644 (file)
@@ -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)