OpenSSL should ignore missing config file
Signed-off-by: mengwenhua <mengwenhua@xfusion.com>
This commit is contained in:
parent
4393cc0792
commit
88db514061
@ -0,0 +1,32 @@
|
|||||||
|
From 23c8fd736abda6331e38ca045735d636390336f5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alan Antonuk <alan.antonuk@gmail.com>
|
||||||
|
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
|
||||||
|
|
||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: librabbitmq
|
Name: librabbitmq
|
||||||
Version: 0.9.0
|
Version: 0.9.0
|
||||||
Release: 7
|
Release: 8
|
||||||
Summary: The AMQP client library
|
Summary: The AMQP client library
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/alanxz/rabbitmq-c
|
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
|
Patch0001: rabbitmq-c-0.9.0-5.sw.patch
|
||||||
|
|
||||||
Patch6000: backport-0001-Fix-instructions-for-default-build.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: cmake > 2.8
|
||||||
BuildRequires: popt-devel > 1.14
|
BuildRequires: popt-devel > 1.14
|
||||||
@ -73,6 +74,9 @@ make test
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 7 2023 mengwenhua <mengwenhua@xfusion.com> - 0.9.0-8
|
||||||
|
- OpenSSL should ignore missing config file
|
||||||
|
|
||||||
* Fri Jan 6 2023 mengwenhua <mengwenhua@xfusion.com> - 0.9.0-7
|
* Fri Jan 6 2023 mengwenhua <mengwenhua@xfusion.com> - 0.9.0-7
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user