diff options
author | Richard Levitte <levitte@openssl.org> | 2015-05-29 08:07:10 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-05-29 12:41:50 +0200 |
commit | 296f54ee211edbf8d21479091b4c20a9ee7698ad (patch) | |
tree | 4f746de806c85723368d65c4ab36d8e34974b214 /apps/ts.c | |
parent | 21425195009e4daf6971453f8a0be08375ae9eec (diff) |
Restore module loading
The module loading feature got broken a while ago, so restore it, but
have it a bit more explicit this time around.
Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'apps/ts.c')
-rw-r--r-- | apps/ts.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -316,6 +316,10 @@ int ts_main(int argc, char **argv) goto end; } + conf = load_config_file(configfile); + if (!app_load_modules(conf)) + goto end; + /* * Check consistency of parameters and execute the appropriate function. */ @@ -331,13 +335,10 @@ int ts_main(int argc, char **argv) ret = data != NULL && digest != NULL; if (ret) goto opthelp; - /* Load the config file for possible policy OIDs. */ - conf = load_config_file(configfile); ret = !query_command(data, digest, md, policy, no_nonce, cert, in, out, text); break; case OPT_REPLY: - conf = load_config_file(configfile); if (in == NULL) { ret = !(queryfile != NULL && conf != NULL && !token_in); if (ret) |