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>
This commit is contained in:
Dr. Stephen Henson 2014-07-23 17:19:48 +01:00
parent ceea4bf047
commit 8e55e6de45
2 changed files with 1 additions and 5 deletions

View file

@ -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();

View file

@ -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