From 88db5140618204a839e24e9a9dad91fb5c5ac794 Mon Sep 17 00:00:00 2001 From: mengwenhua Date: Sat, 7 Jan 2023 16:24:27 +0800 Subject: [PATCH] OpenSSL should ignore missing config file Signed-off-by: mengwenhua --- ...SL-should-ignore-missing-config-file.patch | 32 +++++++++++++++++++ librabbitmq.spec | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 backport-0001-OpenSSL-should-ignore-missing-config-file.patch diff --git a/backport-0001-OpenSSL-should-ignore-missing-config-file.patch b/backport-0001-OpenSSL-should-ignore-missing-config-file.patch new file mode 100644 index 0000000..0dda6ba --- /dev/null +++ b/backport-0001-OpenSSL-should-ignore-missing-config-file.patch @@ -0,0 +1,32 @@ +From 23c8fd736abda6331e38ca045735d636390336f5 Mon Sep 17 00:00:00 2001 +From: Alan Antonuk +Date: Sat, 8 Sep 2018 11:48:35 -0700 +Subject: [PATCH] OpenSSL should ignore missing config file + +When initializing OpenSSL in v1.1.0 or later, tell OpenSSL to ignore +missing openssl.cnf. + +Fixes #523 +--- + librabbitmq/amqp_openssl.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/librabbitmq/amqp_openssl.c b/librabbitmq/amqp_openssl.c +index bcd5ba5..1fac25d 100644 +--- a/librabbitmq/amqp_openssl.c ++++ b/librabbitmq/amqp_openssl.c +@@ -584,8 +584,9 @@ static int setup_openssl(void) { + CRYPTO_set_locking_callback(ssl_locking_callback); + + #ifdef AMQP_OPENSSL_V110 +- if (CONF_modules_load_file(NULL, "rabbitmq-c", CONF_MFLAGS_DEFAULT_SECTION) <= +- 0) { ++ if (CONF_modules_load_file( ++ NULL, "rabbitmq-c", ++ CONF_MFLAGS_DEFAULT_SECTION | CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) { + status = AMQP_STATUS_SSL_ERROR; + goto out; + } +-- +2.37.3.windows.1 + diff --git a/librabbitmq.spec b/librabbitmq.spec index 9559820..ef318fe 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -4,7 +4,7 @@ Name: librabbitmq Version: 0.9.0 -Release: 7 +Release: 8 Summary: The AMQP client library License: MIT URL: https://github.com/alanxz/rabbitmq-c @@ -14,6 +14,7 @@ Patch0000: CVE-2019-18609.patch Patch0001: rabbitmq-c-0.9.0-5.sw.patch Patch6000: backport-0001-Fix-instructions-for-default-build.patch +Patch6001: backport-0001-OpenSSL-should-ignore-missing-config-file.patch BuildRequires: cmake > 2.8 BuildRequires: popt-devel > 1.14 @@ -73,6 +74,9 @@ make test %changelog +* Sat Jan 7 2023 mengwenhua - 0.9.0-8 +- OpenSSL should ignore missing config file + * Fri Jan 6 2023 mengwenhua - 0.9.0-7 - Type:bugfix - CVE:NA