generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add AES and GOST S/MIME capabilities if algorithms are supported.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-06-06 12:35:05 +00:00
parent 6f344eab03
commit 61e5ec4b1e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/pkcs7/pk7_smime.c
View File

@ -150,6 +150,13 @@ static int 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)
@ -194,7 +201,12 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
ERR_R_MALLOC_FAILURE);
goto err;
}
if (!add_cipher_smcap(smcap, NID_des_ede3_cbc, -1)
if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
|| !add_digest_smcap(smcap, NID_id_GostR3411_94, -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)
|| !add_cipher_smcap(smcap, NID_rc2_cbc, 128)
|| !add_cipher_smcap(smcap, NID_rc2_cbc, 64)
|| !add_cipher_smcap(smcap, NID_des_cbc, -1)