]> www.wagner.pp.ru Git - openssl-gost/engine.git/blob - patches/1.0.2/smimecap.diff
Merge pull request #56 from lumag/patch-1
[openssl-gost/engine.git] / patches / 1.0.2 / smimecap.diff
1 diff -Nuar openssl-1.0.2d/crypto/cms/cms_sd.c openssl-work/crypto/cms/cms_sd.c
2 --- openssl-1.0.2d/crypto/cms/cms_sd.c  2015-07-09 15:57:15.000000000 +0400
3 +++ openssl-work/crypto/cms/cms_sd.c    2015-03-26 13:00:20.000000000 +0400
4 @@ -941,6 +941,8 @@
5  int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
6  {
7      if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
8 +        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
9 +        || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
10          || !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
11          || !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
12          || !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1)
13 diff -Nuar openssl-1.0.2d/crypto/pkcs7/pk7_smime.c openssl-work/crypto/pkcs7/pk7_smime.c
14 --- openssl-1.0.2d/crypto/pkcs7/pk7_smime.c     2015-07-09 15:53:21.000000000 +0400
15 +++ openssl-work/crypto/pkcs7/pk7_smime.c       2015-03-26 13:00:21.000000000 +0400
16 @@ -185,6 +185,8 @@
17                  goto err;
18              }
19              if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
20 +                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
21 +                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
22                  || !add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
23                  || !add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
24                  || !add_cipher_smcap(smcap, NID_aes_192_cbc, -1)
25