From: Matt Caswell <matt@openssl.org>
Date: Wed, 26 Jan 2022 12:35:30 +0000 (+0000)
Subject: Ensure ciphers command honours -propquery
X-Git-Tag: openssl-3.2.0-alpha1~3013
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ed381736b063284bdbd5d302988617aa4366a3f;p=thirdparty%2Fopenssl.git

Ensure ciphers command honours -propquery

Any propquery passed via the -propquery option to the ciphers command was
being ignored.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17595)
---

diff --git a/apps/ciphers.c b/apps/ciphers.c
index dcf0d3fa1e1..d3453e915b5 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -186,7 +186,7 @@ int ciphers_main(int argc, char **argv)
         goto end;
     }
 
-    ctx = SSL_CTX_new(meth);
+    ctx = SSL_CTX_new_ex(app_get0_libctx(), app_get0_propq(), meth);
     if (ctx == NULL)
         goto err;
     if (SSL_CTX_set_min_proto_version(ctx, min_version) == 0)