mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
package/omniorb: Fix build with OpenSSL 4.0.0
Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
eb6d16df92
commit
a731846e46
63
package/omniorb/0001-openssl4.patch
Normal file
63
package/omniorb/0001-openssl4.patch
Normal file
@@ -0,0 +1,63 @@
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Mon, 1 Jun 2026 11:07:35 +0100
|
||||
Subject: OpenSSL 4.0.0 returns const pointers from X509 functions
|
||||
|
||||
Origin: upstream, https://sourceforge.net/p/omniorb/svn/6818/
|
||||
Bug-Debian: https://bugs.debian.org/1138480
|
||||
Last-Update: 2026-06-01
|
||||
|
||||
Downloaded from Debian:
|
||||
https://sources.debian.org/src/omniorb-dfsg/4.3.4%2Bds1-1/debian/patches/openssl-4.patch
|
||||
|
||||
Upstream: https://sourceforge.net/p/omniorb/svn/6818/
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
src/lib/omniORB/orbcore/http/httpConnection.cc | 6 +++---
|
||||
src/lib/omniORB/orbcore/ssl/sslConnection.cc | 6 +++---
|
||||
2 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/lib/omniORB/orbcore/http/httpConnection.cc b/src/lib/omniORB/orbcore/http/httpConnection.cc
|
||||
index 1e70f93..9da18cd 100644
|
||||
--- a/src/lib/omniORB/orbcore/http/httpConnection.cc
|
||||
+++ b/src/lib/omniORB/orbcore/http/httpConnection.cc
|
||||
@@ -2554,14 +2554,14 @@ httpConnection::setPeerDetails() {
|
||||
|
||||
int lastpos = -1;
|
||||
|
||||
- X509_NAME* name = X509_get_subject_name(peer_cert);
|
||||
+ const X509_NAME* name = X509_get_subject_name(peer_cert);
|
||||
lastpos = X509_NAME_get_index_by_NID(name, NID_commonName, lastpos);
|
||||
|
||||
if (lastpos == -1)
|
||||
return;
|
||||
|
||||
- X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos);
|
||||
- ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne);
|
||||
+ const X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos);
|
||||
+ const ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne);
|
||||
|
||||
// Convert to native code set
|
||||
cdrMemoryStream stream;
|
||||
diff --git a/src/lib/omniORB/orbcore/ssl/sslConnection.cc b/src/lib/omniORB/orbcore/ssl/sslConnection.cc
|
||||
index f02f3f0..d29d2b8 100644
|
||||
--- a/src/lib/omniORB/orbcore/ssl/sslConnection.cc
|
||||
+++ b/src/lib/omniORB/orbcore/ssl/sslConnection.cc
|
||||
@@ -548,14 +548,14 @@ sslConnection::setPeerDetails() {
|
||||
|
||||
int lastpos = -1;
|
||||
|
||||
- X509_NAME* name = X509_get_subject_name(peer_cert);
|
||||
+ const X509_NAME* name = X509_get_subject_name(peer_cert);
|
||||
lastpos = X509_NAME_get_index_by_NID(name, NID_commonName, lastpos);
|
||||
|
||||
if (lastpos == -1)
|
||||
return;
|
||||
|
||||
- X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos);
|
||||
- ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne);
|
||||
+ const X509_NAME_ENTRY* ne = X509_NAME_get_entry(name, lastpos);
|
||||
+ const ASN1_STRING* asn1_str = X509_NAME_ENTRY_get_data(ne);
|
||||
|
||||
// Convert to native code set
|
||||
cdrMemoryStream stream;
|
||||
Reference in New Issue
Block a user