summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-06-07 21:46:19 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-06-10 21:56:00 +0100
commite1fa652d5ef6e505ce734ca99c8837201b880cc7 (patch)
tree8be3a7d2e05765c81cf56f6ed8ada39d5f0df282 /ssl
parenta8e4ac6a2fe67c19672ecf0c6aeafa15801ce3a5 (diff)
Restore GOST mac setup.
Restore GOST mac setup which was accidentally removed during cipher refactor. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_ciph.c4
1 files changed, 4 insertions, 0 deletions
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