]> wagner.pp.ru Git - openssl-gost/engine.git/blob - patches/1.0.2/4.smimecap.diff
Adjust patches (closing #58)
[openssl-gost/engine.git] / patches / 1.0.2 / 4.smimecap.diff
1 diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
2 index a41aca8e12..f31fd1598c 100644
3 --- a/crypto/cms/cms_sd.c
4 +++ b/crypto/cms/cms_sd.c
5 @@ -943,6 +943,8 @@ static int cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
6  int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
7  {
8      if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
9 +        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
10 +        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
11          || !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
12          || !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
13          || !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1)
14 diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
15 index dc9b484078..12486ad766 100644
16 --- a/crypto/pkcs7/pk7_smime.c
17 +++ b/crypto/pkcs7/pk7_smime.c
18 @@ -185,6 +185,8 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
19                  goto err;
20              }
21              if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
22 +                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
23 +                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
24                  || !add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
25                  || !add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
26                  || !add_cipher_smcap(smcap, NID_aes_192_cbc, -1)