[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  b36d6a5ef857a9e08b1fdb80ed5aa0bdbcec9aae (commit)
       via  f6d3359d6548930c9da9eca438f428a03bad7707 (commit)
      from  74cd923a78b490d46af9c3dc5c8dc7a741c5e576 (commit)


- Log -----------------------------------------------------------------
commit b36d6a5ef857a9e08b1fdb80ed5aa0bdbcec9aae
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Thu Nov 12 21:27:37 2020 +0100

    apps/cmp.c: Correct -keyform option range w.r.t engine
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13690)

commit f6d3359d6548930c9da9eca438f428a03bad7707
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Wed Dec 16 13:35:27 2020 +0100

    apps/cmp.c: Fix bug on -path option introduced in commit 3c9d6266ed85
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13690)

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

Summary of changes:
 apps/cmp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/cmp.c b/apps/cmp.c
index b830b6a3c5..a484234f90 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -527,7 +527,7 @@ static varref cmp_vars[] = { /* must be in same order as enumerated above! */
 
     {&opt_oldcert}, {(char **)&opt_revreason},
 
-    {&opt_server}, {&opt_proxy}, {&opt_no_proxy}, {&opt_path},
+    {&opt_server}, {&opt_path}, {&opt_proxy}, {&opt_no_proxy},
     {(char **)&opt_msg_timeout}, {(char **)&opt_total_timeout},
 
     {&opt_trusted}, {&opt_untrusted}, {&opt_srvcert},
@@ -1068,7 +1068,7 @@ static int transform_opts(void)
         return 0;
     }
 
-#ifdef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 # define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_ENGINE)
 #else
 # define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12)