diff options
| author | Matt Caswell <matt@openssl.org> | 2020-11-04 12:34:15 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-06 11:34:48 +0100 |
| commit | b9b2135d22b93f949fd77f293925fc66158416ff (patch) | |
| tree | e82c316f4f3ef24d8ec2e77a9de085d583b1adc3 /crypto/conf/conf_mod.c | |
| parent | Don't clear errors on failure in CONF_modules_load_file_ex() (diff) | |
| download | openssl-b9b2135d22b93f949fd77f293925fc66158416ff.tar.xz openssl-b9b2135d22b93f949fd77f293925fc66158416ff.zip | |
Don't clear the whole error stack when loading engines
Loading the various built-in engines was unconditionally clearing the
whole error stack. During config file processing processing a .include
directive which fails results in errors being added to the stack - but
we carry on anyway. These errors were then later being removed by the
engine loading code, meaning that problems with the .include directive
never get shown.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13311)
Diffstat (limited to 'crypto/conf/conf_mod.c')
| -rw-r--r-- | crypto/conf/conf_mod.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index e7fb890378..f287cb28eb 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -208,7 +208,6 @@ DEFINE_RUN_ONCE_STATIC(do_load_builtin_modules) /* Need to load ENGINEs */ ENGINE_load_builtin_engines(); #endif - ERR_clear_error(); return 1; } |