X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_derive.c;h=08577cda5703fcda185050780445497f88e8d4a5;hb=97b3db1ebf985b73718faaae6c425782d526d44f;hp=c93549cd762b481d520f8706ee55c437bd85c146;hpb=b56b7ee05276b92c282efa412ae94163b88ec350;p=openssl-gost%2Fengine.git

diff --git a/test_derive.c b/test_derive.c
index c93549c..08577cd 100644
--- a/test_derive.c
+++ b/test_derive.c
@@ -7,6 +7,11 @@
  * See https://www.openssl.org/source/license.html for details
  */
 
+#ifdef _MSC_VER
+# pragma warning(push, 3)
+# include <openssl/applink.c>
+# pragma warning(pop)
+#endif
 #include <openssl/ec.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>
@@ -15,12 +20,11 @@
 #include <string.h>
 #include "gost_lcl.h"
 
-#define T(e) ({ \
+#define T(e) \
     if (!(e)) { \
         ERR_print_errors_fp(stderr); \
         OpenSSLDie(__FILE__, __LINE__, #e); \
-    } \
-})
+    }
 
 #define cRED    "\033[1;31m"
 #define cDRED   "\033[0;31m"
@@ -364,13 +368,7 @@ int main(int argc, char **argv)
 {
     int ret = 0;
 
-    setenv("OPENSSL_ENGINES", ENGINE_DIR, 0);
     OPENSSL_add_all_algorithms_conf();
-    ERR_load_crypto_strings();
-    ENGINE *eng;
-    T(eng = ENGINE_by_id("gost"));
-    T(ENGINE_init(eng));
-    T(ENGINE_set_default(eng, ENGINE_METHOD_ALL));
 
     int i;
     for (i = 0; i < OSSL_NELEM(derive_tests); i++)
@@ -389,9 +387,6 @@ int main(int argc, char **argv)
         ret |= test_derive_alg("gost2012_512", "C", i);
     }
 
-    ENGINE_finish(eng);
-    ENGINE_free(eng);
-
     if (ret)
         printf(cDRED "= Some tests FAILED!" cNORM "\n");
     else