diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-19 19:46:38 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-10-20 09:04:00 +0200 |
| commit | 0df1caa77b793d055714f4d78d9aac7a985babb8 (patch) | |
| tree | 87eb3caf0026693522b38c28043f1beb3b37b888 /apps/ca.c | |
| parent | aa01b82c69eeb0cfd255174111fc34a7ed5f8429 (diff) | |
apps: make setup_engine() and release_engine() available always
This removes some #ifndef clutter.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1644)
Diffstat (limited to 'apps/ca.c')
| -rw-r--r-- | apps/ca.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -319,9 +319,7 @@ int MAIN(int argc, char **argv) #define BSIZE 256 MS_STATIC char buf[3][BSIZE]; char *randfile = NULL; -#ifndef OPENSSL_NO_ENGINE char *engine = NULL; -#endif char *tofree = NULL; DB_ATTR db_attr; @@ -595,9 +593,7 @@ int MAIN(int argc, char **argv) if (!load_config(bio_err, conf)) goto err; -#ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine, 0); -#endif /* Lets get the config section we are using */ if (section == NULL) { @@ -1485,10 +1481,7 @@ int MAIN(int argc, char **argv) X509_CRL_free(crl); NCONF_free(conf); NCONF_free(extconf); -#ifndef OPENSSL_NO_ENGINE - if (e != NULL) - release_engine(e); -#endif + release_engine(e); OBJ_cleanup(); apps_shutdown(); OPENSSL_EXIT(ret); |