From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 23 Jul 2014 16:19:48 +0000 (+0100)
Subject: Don't call setenv in gost2814789t.c
X-Git-Tag: master-post-reformat~558
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8e55e6de45f715d4a2e0b31775c1c739ce90c1d5;p=oweals%2Fopenssl.git

Don't call setenv in gost2814789t.c

The call to setenv in gost2814789t.c is not portable and may
not reflect the location of the GOST ENGINE on all platforms anyway.
Instead set OPENSSL_ENGINES in test/Makefile
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
---

diff --git a/engines/ccgost/gost2814789t.c b/engines/ccgost/gost2814789t.c
index a59ac92409..ded5b3405f 100644
--- a/engines/ccgost/gost2814789t.c
+++ b/engines/ccgost/gost2814789t.c
@@ -28,7 +28,6 @@ int main(int argc, char *argv[])
 #include <openssl/obj_mac.h>
 
 #define CCGOST_ID "gost"
-#define CCGOST_DIR "../engines/ccgost"
 
 #include "../engines/ccgost/gost89.h"
 
@@ -1403,9 +1402,6 @@ int main(int argc, char *argv[])
     /* 
      * ccgost engine test on GostR3411_94_CryptoProParamSet
      */
-    #ifndef OPENSSL_NO_DYNAMIC_ENGINE
-	setenv("OPENSSL_ENGINES", CCGOST_DIR, 1);
-    #endif
     ERR_load_crypto_strings();
     ENGINE_load_builtin_engines();
     OPENSSL_load_builtin_modules();
diff --git a/test/Makefile b/test/Makefile
index 3f78c68d3c..601ea1b0e2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -255,7 +255,7 @@ test_rand: $(RANDTEST)$(EXE_EXT)
 	../util/shlib_wrap.sh ./$(RANDTEST)
 
 test_gost2814789: $(GOST2814789TEST)$(EXE_EXT)
-	../util/shlib_wrap.sh ./$(GOST2814789TEST)
+	OPENSSL_ENGINES=../engines/ccgost ../util/shlib_wrap.sh ./$(GOST2814789TEST)
 
 test_enc: ../apps/openssl$(EXE_EXT) testenc
 	@sh ./testenc