From 12455d6eff265f95b0a7e20595630321799f50a2 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sun, 9 Nov 2014 19:17:13 +0000
Subject: GOST crypto algorithms (well, most of them), ported from the removed
 GOST engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
 libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.
---
 src/lib/libcrypto/cms/cms_sd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/cms/cms_sd.c')

diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index 70ad897bda..f4119f7a1c 100644
--- a/src/lib/libcrypto/cms/cms_sd.c
+++ b/src/lib/libcrypto/cms/cms_sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_sd.c,v 1.8 2014/07/12 16:03:37 miod Exp $ */
+/* $OpenBSD: cms_sd.c,v 1.9 2014/11/09 19:17:13 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -920,6 +920,8 @@ CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
 {
 	if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) ||
 	    !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1) ||
+	    !cms_add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_256, -1) ||
+	    !cms_add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_512, -1) ||
 	    !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) ||
 	    !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) ||
 	    !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) ||
-- 
cgit v1.2.3-55-g6feb