summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms/cms_sd.c
diff options
context:
space:
mode:
authormiod <>2014-11-09 19:17:13 +0000
committermiod <>2014-11-09 19:17:13 +0000
commit12455d6eff265f95b0a7e20595630321799f50a2 (patch)
tree8f4747a1df4b007feca32e262b38052339c686c1 /src/lib/libcrypto/cms/cms_sd.c
parenta3c50c7d270773c83559454fd2b75ec6e04f43ab (diff)
downloadopenbsd-12455d6eff265f95b0a7e20595630321799f50a2.tar.gz
openbsd-12455d6eff265f95b0a7e20595630321799f50a2.tar.bz2
openbsd-12455d6eff265f95b0a7e20595630321799f50a2.zip
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.
Diffstat (limited to 'src/lib/libcrypto/cms/cms_sd.c')
-rw-r--r--src/lib/libcrypto/cms/cms_sd.c4
1 files changed, 3 insertions, 1 deletions
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 @@
1/* $OpenBSD: cms_sd.c,v 1.8 2014/07/12 16:03:37 miod Exp $ */ 1/* $OpenBSD: cms_sd.c,v 1.9 2014/11/09 19:17:13 miod Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -920,6 +920,8 @@ CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
920{ 920{
921 if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) || 921 if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) ||
922 !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1) || 922 !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1) ||
923 !cms_add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_256, -1) ||
924 !cms_add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_512, -1) ||
923 !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) || 925 !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) ||
924 !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) || 926 !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) ||
925 !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) || 927 !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) ||