From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Fri, 17 Aug 2018 14:32:18 +0000 (+0300)
Subject: Master is designed to be 1.1.1-compatible.
X-Git-Tag: v3.0.0~382
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=4f5c0289ff2ad78c6761b8b63630ef62379a3c86;p=openssl-gost%2Fengine.git

Master is designed to be 1.1.1-compatible.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a937569..af73f45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ include(GNUInstallDirs)
 
 enable_testing()
 
-find_package(OpenSSL 1.0.2 REQUIRED)
+find_package(OpenSSL 1.1.1 REQUIRED)
 include_directories(${OPENSSL_INCLUDE_DIR})
 
 if (CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -80,7 +80,6 @@ set(GOST_CORE_SOURCE_FILES
         gost_keywrap.c
         gost_keywrap.h
         gost_lcl.h
-        compat.h
         gost_params.c
         )
 
diff --git a/gost_lcl.h b/gost_lcl.h
index 528794a..f63f23c 100644
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -9,7 +9,6 @@
  *         OpenSSL 0.9.9 libraries required to compile and use        *
  *                              this code                             *
  **********************************************************************/
-# include "compat.h"
 # include <openssl/bn.h>
 # include <openssl/evp.h>
 # include <openssl/dsa.h>
diff --git a/gost_md.c b/gost_md.c
index 4b8e7e5..5d2c537 100644
--- a/gost_md.c
+++ b/gost_md.c
@@ -27,9 +27,6 @@ EVP_MD *digest_gost(void)
         EVP_MD *md;
 
         if ((md = EVP_MD_meth_new(NID_id_GostR3411_94, NID_undef)) == NULL
-#if (OPENSSL_VERSION_NUMBER <= 0x10002100L)
-	    || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
-#endif
             || !EVP_MD_meth_set_result_size(md, 32)
             || !EVP_MD_meth_set_input_blocksize(md, 32)
             || !EVP_MD_meth_set_app_datasize(md,
diff --git a/gost_md2012.c b/gost_md2012.c
index 5462dea..5acb111 100644
--- a/gost_md2012.c
+++ b/gost_md2012.c
@@ -9,7 +9,6 @@
  *                                                                    *
  **********************************************************************/
 
-#include "compat.h"
 #include <openssl/evp.h>
 #include "gosthash2012.h"
 
@@ -38,9 +37,6 @@ EVP_MD *digest_gost2012_256(void)
 
         if ((md =
              EVP_MD_meth_new(NID_id_GostR3411_2012_256, NID_undef)) == NULL
-#if (OPENSSL_VERSION_NUMBER <= 0x10002100L)
-	    || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
-#endif
             || !EVP_MD_meth_set_result_size(md, 32)
             || !EVP_MD_meth_set_input_blocksize(md, 64)
             || !EVP_MD_meth_set_app_datasize(md, sizeof(gost2012_hash_ctx))
@@ -71,9 +67,6 @@ EVP_MD *digest_gost2012_512(void)
 
         if ((md =
              EVP_MD_meth_new(NID_id_GostR3411_2012_512, NID_undef)) == NULL
-#if (OPENSSL_VERSION_NUMBER <= 0x10002100L)
-	    || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
-#endif
             || !EVP_MD_meth_set_result_size(md, 64)
             || !EVP_MD_meth_set_input_blocksize(md, 64)
             || !EVP_MD_meth_set_app_datasize(md, sizeof(gost2012_hash_ctx))