apps: remove some #ifndef clutter
authorRichard Levitte <levitte@openssl.org>
Wed, 19 Oct 2016 17:49:43 +0000 (19:49 +0200)
committerRichard Levitte <richard@levitte.org>
Thu, 20 Oct 2016 06:59:54 +0000 (08:59 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1643)
(cherry picked from commit b85bf6395251dc28457b95de586a2f0a5faae4af)

apps/speed.c

index 8437ab20258dae25b19d0ca1c99f1238291f6a5e..cdd0da1100eff7040e114f1e5906875d5b1fd154 100644 (file)
@@ -1224,9 +1224,7 @@ int speed_main(int argc, char **argv)
     int async_init = 0;
     int loopargs_len = 0;
     char *prog;
-#ifndef OPENSSL_NO_ENGINE
     const char *engine_id = NULL;
-#endif
     const EVP_CIPHER *evp_cipher = NULL;
     double d = 0.0;
     OPTION_CHOICE o;
@@ -1400,9 +1398,7 @@ int speed_main(int argc, char **argv)
              * initialised by each child process, not by the parent.
              * So store the name here and run setup_engine() later on.
              */
-#ifndef OPENSSL_NO_ENGINE
             engine_id = opt_arg();
-#endif
             break;
         case OPT_MULTI:
 #ifndef NO_FORK