From: Nikolay Morozov <nmorozoff77@yandex.ru>
Date: Wed, 12 Feb 2020 12:20:41 +0000 (+0300)
Subject: Forgotten GOST2012 support in non-vital places
X-Git-Tag: openssl-3.0.0-alpha1~472
X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=6d9b4d7f4bf1ea9bc1d1b1bd8b7e83c6fbeed395;hp=138a522c8995ccf6bc0d3ba24f0b9111ee4de056;p=openssl.git

Forgotten GOST2012 support in non-vital places

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/11072)
---

diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index 42a82ca33c..48fd7f4af5 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -190,6 +190,7 @@ static STRINT_PAIR cert_type_list[] = {
     {"RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH},
     {"ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH},
     {"GOST01 Sign", TLS_CT_GOST01_SIGN},
+    {"GOST12 Sign", TLS_CT_GOST12_SIGN},
     {NULL}
 };
 
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 757fe9eb7a..71916927b8 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -199,6 +199,14 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
             BIO_puts(out, "gostr3411-94");
             goto err;
 
+        case NID_id_GostR3411_2012_256:
+            BIO_puts(out, "gostr3411-2012-256");
+            goto err;
+
+        case NID_id_GostR3411_2012_512:
+            BIO_puts(out, "gostr3411-2012-512");
+            goto err;
+
         default:
             if (have_unknown)
                 write_comma = 0;