From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sun, 24 Jun 2018 19:27:45 +0000 (+0300)
Subject: Remove duplicates
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=10f835002baea5abacf5e06b88e3b4912c3fd324;p=openssl-gost%2Fengine.git

Remove duplicates
---

diff --git a/patches/1.0.2/numeric.diff b/patches/1.0.2/numeric.diff
deleted file mode 100644
index 8c47d9d..0000000
--- a/patches/1.0.2/numeric.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nuar openssl-1.0.2d/crypto/asn1/a_mbstr.c openssl-work/crypto/asn1/a_mbstr.c
---- openssl-1.0.2d/crypto/asn1/a_mbstr.c	2015-07-09 15:53:21.000000000 +0400
-+++ openssl-work/crypto/asn1/a_mbstr.c	2015-03-26 13:00:21.000000000 +0400
-@@ -173,6 +173,8 @@
-         str_type = V_ASN1_PRINTABLESTRING;
-     else if (mask & B_ASN1_IA5STRING)
-         str_type = V_ASN1_IA5STRING;
-+    else if (mask & B_ASN1_NUMERICSTRING)
-+        str_type = V_ASN1_NUMERICSTRING;
-     else if (mask & B_ASN1_T61STRING)
-         str_type = V_ASN1_T61STRING;
-     else if (mask & B_ASN1_BMPSTRING) {
-diff -Nuar openssl-1.0.2d/crypto/asn1/a_strnid.c openssl-work/crypto/asn1/a_strnid.c
---- openssl-1.0.2d/crypto/asn1/a_strnid.c	2015-07-09 15:53:21.000000000 +0400
-+++ openssl-work/crypto/asn1/a_strnid.c	2015-03-26 13:00:21.000000000 +0400
-@@ -192,7 +192,10 @@
-     {NID_name, 1, ub_name, DIRSTRING_TYPE, 0},
-     {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-     {NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
--    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK}
-+    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
-+    {NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
-+    {NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
-+    {NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK}
- };
- 
- static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
-
diff --git a/patches/1.0.2/smimecap.diff b/patches/1.0.2/smimecap.diff
deleted file mode 100644
index 2451b51..0000000
--- a/patches/1.0.2/smimecap.diff
+++ /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)
-