test/enginetest.c: Make sure no config file is loaded
If a config file gets loaded, the tests get disturbed. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9393)
This commit is contained in:
parent
3cb45a5585
commit
5800ba7610
1 changed files with 15 additions and 2 deletions
|
@ -121,8 +121,12 @@ static int test_engines(void)
|
|||
display_engine_list();
|
||||
|
||||
/*
|
||||
* Depending on whether there's any hardware support compiled in, this
|
||||
* remove may be destined to fail.
|
||||
* At this point, we should have an empty list, unless some hardware
|
||||
* support engine got added. However, since we don't allow the config
|
||||
* file to be loaded and don't otherwise load any built in engines,
|
||||
* that is unlikely. Still, we check, if for nothing else, then to
|
||||
* notify that something is a little off (and might mean that |new_h1|
|
||||
* wasn't unloaded when it should have)
|
||||
*/
|
||||
if ((ptr = ENGINE_get_first()) != NULL) {
|
||||
if (!ENGINE_remove(ptr))
|
||||
|
@ -347,6 +351,15 @@ static int test_redirect(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
int global_init(void)
|
||||
{
|
||||
/*
|
||||
* If the config file gets loaded, the dynamic engine will be loaded,
|
||||
* and that interferes with our test above.
|
||||
*/
|
||||
return OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG, NULL);
|
||||
}
|
||||
|
||||
int setup_tests(void)
|
||||
{
|
||||
#ifdef OPENSSL_NO_ENGINE
|
||||
|
|
Loading…
Reference in a new issue