Adjust patches (closing #58)

[openssl-gost/engine.git] / patches / 1.0.2 / 4.smimecap.diff

diff --git a/patches/1.0.2/4.smimecap.diff b/patches/1.0.2/4.smimecap.diff
new file mode 100644 (file)
index 0000000..6b75924
--- /dev/null
+++ b/patches/1.0.2/4.smimecap.diff
@@ -0,0 +1,26 @@
+diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
+index a41aca8e12..f31fd1598c 100644
+--- a/crypto/cms/cms_sd.c
++++ b/crypto/cms/cms_sd.c
+@@ -943,6 +943,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)
+diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
+index dc9b484078..12486ad766 100644
+--- a/crypto/pkcs7/pk7_smime.c
++++ b/crypto/pkcs7/pk7_smime.c
+@@ -185,6 +185,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)