mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-26 20:10:35 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/capnproto: fix build with OpenSSL 4.0.0

Browse Source 
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
2026-09-19 17:58:01 +02:00
committed by Thomas Petazzoni
parent 8a224bc363
commit d1bc4bddb4
2 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
package/capnproto/0002-Address-compiler-errors-when-building-against-OpenSS.patch Normal file
View File

@@ -0,0 +1,38 @@
From 33960e1a762667f890701775e184cbd06ee1bb66 Mon Sep 17 00:00:00 2001
From: tony mancill <tmancill@debian.org>
Date: Wed, 27 May 2026 06:13:20 -0700
Subject: [PATCH] Address compiler errors when building against OpenSSL 4.0
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1137594
Upstream: https://github.com/capnproto/capnproto/commit/33960e1a762667f890701775e184cbd06ee1bb66
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
c++/src/kj/compat/tls.c++ | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/c++/src/kj/compat/tls.c++ b/c++/src/kj/compat/tls.c++
index 6affeb1f..87e308aa 100644
--- a/c++/src/kj/compat/tls.c++
+++ b/c++/src/kj/compat/tls.c++
@@ -1125,13 +1125,13 @@ kj::String TlsPeerIdentity::getCommonName() {
KJ_FAIL_REQUIRE("client did not provide a certificate") { return nullptr; }
}
- X509_NAME* subj = X509_get_subject_name(reinterpret_cast<X509*>(cert));
+ const X509_NAME* subj = X509_get_subject_name(reinterpret_cast<X509*>(cert));
int index = X509_NAME_get_index_by_NID(subj, NID_commonName, -1);
KJ_ASSERT(index != -1, "certificate has no common name?");
- X509_NAME_ENTRY* entry = X509_NAME_get_entry(subj, index);
+ const X509_NAME_ENTRY* entry = X509_NAME_get_entry(subj, index);
KJ_ASSERT(entry != nullptr);
- ASN1_STRING* data = X509_NAME_ENTRY_get_data(entry);
+ const ASN1_STRING* data = X509_NAME_ENTRY_get_data(entry);
KJ_ASSERT(data != nullptr);
unsigned char* out = nullptr;
--
2.47.3

29
package/capnproto/0003-Maintain-compatibility-with-older-OpenSSL-versions.patch Normal file
View File

@@ -0,0 +1,29 @@
From 84dbf3c307dd98b5b7461d314a3b7e42318e374b Mon Sep 17 00:00:00 2001
From: tony mancill <tmancill@debian.org>
Date: Thu, 28 May 2026 21:32:58 -0700
Subject: [PATCH] Maintain compatibility with older OpenSSL versions
Upstream: https://github.com/capnproto/capnproto/commit/84dbf3c307dd98b5b7461d314a3b7e42318e374b
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
c++/src/kj/compat/tls.c++ | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/c++/src/kj/compat/tls.c++ b/c++/src/kj/compat/tls.c++
index 87e308aa..f7026d98 100644
--- a/c++/src/kj/compat/tls.c++
+++ b/c++/src/kj/compat/tls.c++
@@ -1127,7 +1127,8 @@ kj::String TlsPeerIdentity::getCommonName() {
const X509_NAME* subj = X509_get_subject_name(reinterpret_cast<X509*>(cert));
- int index = X509_NAME_get_index_by_NID(subj, NID_commonName, -1);
+ // Cast away const for compatibility with older OpenSSL versions
+ int index = X509_NAME_get_index_by_NID(const_cast<X509_NAME*>(subj), NID_commonName, -1);
KJ_ASSERT(index != -1, "certificate has no common name?");
const X509_NAME_ENTRY* entry = X509_NAME_get_entry(subj, index);
KJ_ASSERT(entry != nullptr);
--
2.47.3