SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-04-20 22:43:32 +00:00
parent df63f5284d
commit 696b0fa6e4
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
9 changed files with 59 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/libcrypto/cms/cms_sd.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cms_sd.c,v 1.32 2024/04/07 06:34:42 tb Exp $ */
/* $OpenBSD: cms_sd.c,v 1.33 2024/04/20 10:11:55 tb Exp $ */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@ -1070,20 +1070,10 @@ cms_add_cipher_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
return 1;
}
static int
cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
{
if (EVP_get_digestbynid(nid))
return CMS_add_simple_smimecap(sk, nid, arg);
return 1;
}
int
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_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) ||
!cms_add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) ||

14
lib/libcrypto/pkcs7/pk7_smime.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: pk7_smime.c,v 1.26 2023/02/16 08:38:17 tb Exp $ */
/* $OpenBSD: pk7_smime.c,v 1.27 2024/04/20 10:11:55 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
*/
@ -152,14 +152,6 @@ add_cipher_smcap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
return 1;
}
static int
add_digest_smcap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
{
if (EVP_get_digestbynid(nid))
return PKCS7_simple_smimecap(sk, nid, arg);
return 1;
}
PKCS7_SIGNER_INFO *
PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, EVP_PKEY *pkey,
const EVP_MD *md, int flags)
@ -192,10 +184,6 @@ PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, EVP_PKEY *pkey,
goto err;
}
if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1) ||
!add_digest_smcap(smcap, NID_id_GostR3411_94, -1) ||
!add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_256, -1) ||
!add_digest_smcap(smcap, NID_id_tc26_gost3411_2012_512, -1) ||
!add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) ||
!add_cipher_smcap(smcap, NID_aes_192_cbc, -1) ||
!add_cipher_smcap(smcap, NID_aes_128_cbc, -1) ||
!add_cipher_smcap(smcap, NID_des_ede3_cbc, -1) ||