Commit c58f3e42 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add GOST12 cms/smime capabilities 



Add additional NID references in the CMS/SMIME capabilities code to cater
for GOST12.

Patch supplied by Dmitry Belyavsky <beldmit@gmail.com>

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 984d6c60

crypto/cms/cms_sd.c

+2 −0
Original line number Diff line number Diff line
@@ -933,6 +933,8 @@ static int cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg) 
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_2012_256, -1)

        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -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)

crypto/pkcs7/pk7_smime.c

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert, 
                goto err;

            }

            if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1)

                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)

                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -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)