diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-03-23 16:30:58 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-03-23 16:30:58 +0000 |
| commit | 783fa7f82ee1d7db52b27c1ed24141d861e36110 (patch) | |
| tree | e427d588ba9d6744258e1bcafb8b9a11ad357b69 | |
| parent | 5aff47e3dad565172f0268e0b685282f816bd1b9 (diff) | |
| parent | 17bcd7a60fb0b7d07718515946ebb064d33ef45b (diff) | |
| download | gnutls-783fa7f82ee1d7db52b27c1ed24141d861e36110.tar.gz | |
Merge branch 'postpone_config_loading' into 'master'
global: Load configuration after FIPS POST
Closes #956
See merge request gnutls/gnutls!1216
| -rw-r--r-- | lib/global.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/global.c b/lib/global.c index b42fcb2632..9a65d114cc 100644 --- a/lib/global.c +++ b/lib/global.c @@ -368,7 +368,6 @@ static int _gnutls_global_init(unsigned constructor) _gnutls_register_accel_crypto(); _gnutls_cryptodev_init(); - _gnutls_load_system_priorities(); #ifdef ENABLE_FIPS140 /* These self tests are performed on the overridden algorithms @@ -385,6 +384,7 @@ static int _gnutls_global_init(unsigned constructor) _gnutls_fips_mode_reset_zombie(); } #endif + _gnutls_load_system_priorities(); _gnutls_switch_lib_state(LIB_STATE_OPERATIONAL); ret = 0; |