From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 7 Jun 2015 20:46:19 +0000 (+0100)
Subject: Restore GOST mac setup.
X-Git-Tag: OpenSSL_1_1_0-pre1~1004
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1fa652d5ef6e505ce734ca99c8837201b880cc7;p=openssl

Restore GOST mac setup.

Restore GOST mac setup which was accidentally removed during cipher
refactor.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 39b5a71094..9b334c4eb5 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -470,6 +470,10 @@ void ssl_load_ciphers(void)
     /* Make sure we can access MD5 and SHA1 */
     OPENSSL_assert(ssl_digest_methods[SSL_MD_MD5_IDX] != NULL);
     OPENSSL_assert(ssl_digest_methods[SSL_MD_SHA1_IDX] != NULL);
+    ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX] = get_optional_pkey_id("gost-mac");
+    if (ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX]) {
+        ssl_mac_secret_size[SSL_MD_GOST89MAC_IDX] = 32;
+    }
 }
 
 #ifndef OPENSSL_NO_COMP