[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1aa516b9438497bec0bf6c2aea55ce00e90cdbb6 (commit)
      from  1640d48c5b4ee0a3ff5a2a5015ee17ac163d9cd4 (commit)


- Log -----------------------------------------------------------------
commit 1aa516b9438497bec0bf6c2aea55ce00e90cdbb6
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 12 15:26:15 2019 +0000

    Fix no-engine
    
    Fix a misplaced "#endif" which was disabling a little too much code.
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/10423)

-----------------------------------------------------------------------

Summary of changes:
 apps/req.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/req.c b/apps/req.c
index 3667ac7bce..b084f108bd 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -101,10 +101,10 @@ const OPTIONS req_options[] = {
     {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
     {"keygen_engine", OPT_KEYGEN_ENGINE, 's',
      "Specify engine to be used for key generation operations"},
+#endif
     {"in", OPT_IN, '<', "Input file"},
     {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
     {"verify", OPT_VERIFY, '-', "Verify signature on REQ"},
-#endif
 
     OPT_SECTION("Certificate"),
     {"new", OPT_NEW, '-', "New request"},