fewer NO_ENGINE #ifdef's

Make setup_engine be a dummy if NO_ENGINE is enabled.
The option is not enabled if NO_ENGINE is enabled, so the one "wasted"
variable just sits there. Removes some variables and code.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz
2015-04-25 15:41:29 -04:00
parent c54cc2b15d
commit 333b070ec0
31 changed files with 88 additions and 218 deletions

View File

@@ -1378,7 +1378,7 @@ int s_server_main(int argc, char *argv[])
session_id_prefix = opt_arg();
break;
case OPT_ENGINE:
engine_id = opt_arg();
e = setup_engine(opt_arg(), 1);
break;
case OPT_RAND:
inrand = opt_arg();
@@ -1449,10 +1449,6 @@ int s_server_main(int argc, char *argv[])
}
#endif
#ifndef OPENSSL_NO_ENGINE
e = setup_engine(engine_id, 1);
#endif
if (!app_passwd(passarg, dpassarg, &pass, &dpass)) {
BIO_printf(bio_err, "Error getting password\n");
goto end;