]> www.wagner.pp.ru Git - openssl-gost/engine.git/blobdiff - patches/1.0.2/smimecap.diff
Start implementing MAGMA algorithm
[openssl-gost/engine.git] / patches / 1.0.2 / smimecap.diff
diff --git a/patches/1.0.2/smimecap.diff b/patches/1.0.2/smimecap.diff
deleted file mode 100644 (file)
index 2451b51..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nuar openssl-1.0.2d/crypto/cms/cms_sd.c openssl-work/crypto/cms/cms_sd.c
---- openssl-1.0.2d/crypto/cms/cms_sd.c 2015-07-09 15:57:15.000000000 +0400
-+++ openssl-work/crypto/cms/cms_sd.c   2015-03-26 13:00:20.000000000 +0400
-@@ -941,6 +941,8 @@
- 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 -Nuar openssl-1.0.2d/crypto/pkcs7/pk7_smime.c openssl-work/crypto/pkcs7/pk7_smime.c
---- openssl-1.0.2d/crypto/pkcs7/pk7_smime.c    2015-07-09 15:53:21.000000000 +0400
-+++ openssl-work/crypto/pkcs7/pk7_smime.c      2015-03-26 13:00:21.000000000 +0400
-@@ -185,6 +185,8 @@
-                 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)
-