summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms/cms_sd.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/cms/cms_sd.c')
-rw-r--r--src/lib/libcrypto/cms/cms_sd.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c
index b783941911..9cdd4ce143 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.32 2024/04/07 06:34:42 tb Exp $ */ 1/* $OpenBSD: cms_sd.c,v 1.33 2024/04/20 10:11:55 tb Exp $ */
2/* 2/*
3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
4 * project. 4 * project.
@@ -1070,20 +1070,10 @@ cms_add_cipher_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
1070 return 1; 1070 return 1;
1071} 1071}
1072 1072
1073static int
1074cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
1075{
1076 if (EVP_get_digestbynid(nid))
1077 return CMS_add_simple_smimecap(sk, nid, arg);
1078 return 1;
1079}
1080
1081int 1073int
1082CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap) 1074CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
1083{ 1075{
1084 if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) || 1076 if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) ||
1085 !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1) ||
1086 !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) ||
1087 !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) || 1077 !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) ||
1088 !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) || 1078 !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1) ||
1089 !cms_add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) || 1079 !cms_add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) ||