mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-21 08:11:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/luvi: 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-10-06 18:20:20 +02:00
committed by Thomas Petazzoni
parent cb7df79cc1
commit 23613c45f6
1 changed files with 403 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

403
package/luvi/0002-feat-support-openssl-4.0.patch Normal file
View File

@@ -0,0 +1,403 @@
From 529b4a42eeb2b77f8f8c829f856977c5b50d0b7b Mon Sep 17 00:00:00 2001
From: zhaozg <zhaozg@gmail.com>
Date: Thu, 16 Apr 2026 14:04:32 +0800
Subject: [PATCH] feat: support openssl 4.0
Upstream: https://github.com/zhaozg/lua-openssl/commit/529b4a42eeb2b77f8f8c829f856977c5b50d0b7b
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
deps/lua-openssl/src/asn1.c | 59 +++++++++++++++++++++++++++++++------------------
deps/lua-openssl/src/crl.c | 9 ++++----
deps/lua-openssl/src/csr.c | 30 +++++++++++++++++--------
deps/lua-openssl/src/openssl.c | 2 ++
deps/lua-openssl/src/private.h | 2 +-
deps/lua-openssl/src/ssl.c | 2 +-
deps/lua-openssl/src/x509.c | 2 +-
deps/lua-openssl/src/xalgor.c | 2 +-
deps/lua-openssl/src/xname.c | 2 +-
deps/lua-openssl/test/helper.lua | 2 +-
10 files changed, 71 insertions(+), 41 deletions(-)
diff --git a/deps/lua-openssl/src/asn1.c b/deps/lua-openssl/src/asn1.c
index d7972738..566d78ee 100644
--- a/deps/lua-openssl/src/asn1.c
+++ b/deps/lua-openssl/src/asn1.c
@@ -499,7 +499,14 @@ openssl_asn1object_new(lua_State *L)
ret = 1;
}
} else if (lua_isnone(L, 1)) {
- ASN1_OBJECT *obj = ASN1_OBJECT_new();
+ /* ASN1_OBJECT_new() is deprecated in OpenSSL 4.0,
+ * but there's no direct replacement for creating an empty object.
+ * We create an object from a dummy NID instead. */
+ ASN1_OBJECT *obj = OBJ_nid2obj(NID_undef);
+ if (obj == NULL) {
+ /* Fallback: create from empty string */
+ obj = OBJ_txt2obj("", 1);
+ }
PUSH_OBJECT(obj, "openssl.asn1_object");
ret = 1;
}
@@ -658,11 +665,13 @@ openssl_push_asn1type(lua_State *L, const ASN1_TYPE *type)
{
lua_newtable(L);
-#define P(V, v) \
- case V_##V: { \
- V *s = (V *)type->value.ptr; \
- AUXILIAR_SETLSTR(L, -1, "value", (const char *)s->data, s->length); \
- break; \
+#define P(V, v) \
+ case V_##V: { \
+ V *s = (V *)type->value.ptr; \
+ AUXILIAR_SETLSTR(L, -1, "value", \
+ (const char *)ASN1_STRING_get0_data(s), \
+ ASN1_STRING_length(s)); \
+ break; \
}
switch (type->type) {
@@ -695,7 +704,7 @@ openssl_push_asn1type(lua_State *L, const ASN1_TYPE *type)
default: {
ASN1_STRING *s = (ASN1_STRING *)type->value.asn1_string;
- AUXILIAR_SETLSTR(L, -1, "value", (const char *)s->data, s->length);
+ AUXILIAR_SETLSTR(L, -1, "value", ASN1_STRING_get0_data(s), ASN1_STRING_length(s));
break;
}
}
@@ -1004,8 +1013,9 @@ openssl_asn1group_set(lua_State *L)
{
ASN1_STRING *s = CHECK_GROUP(1, ASN1_STRING, "openssl.asn1group");
int ret = 1;
+ int type = ASN1_STRING_type(s);
- switch (s->type) {
+ switch (type) {
case V_ASN1_INTEGER: {
ASN1_INTEGER *ai = CHECK_OBJECT(1, ASN1_INTEGER, "openssl.asn1_integer");
long v = luaL_checklong(L, 2);
@@ -1044,16 +1054,19 @@ static time_t
ASN1_TIME_get(ASN1_TIME *time, time_t off)
{
struct tm t;
- const char *str = (const char *)time->data;
size_t i = 0;
+ const char *str = (const char *)ASN1_STRING_get0_data(time);
+ size_t len = ASN1_STRING_length(time);
+ int type = ASN1_STRING_type(time);
+ if (len < 13) return 0; /* Invalid time format */
memset(&t, 0, sizeof(t));
- if (time->type == V_ASN1_UTCTIME) /* two digit year */ {
+ if (type == V_ASN1_UTCTIME) /* two digit year */ {
t.tm_year = (str[i++] - '0') * 10;
t.tm_year += (str[i++] - '0');
if (t.tm_year < 70) t.tm_year += 100;
- } else if (time->type == V_ASN1_GENERALIZEDTIME) /* four digit year */ {
+ } else if (type == V_ASN1_GENERALIZEDTIME) /* four digit year */ {
t.tm_year = (str[i++] - '0') * 1000;
t.tm_year += (str[i++] - '0') * 100;
t.tm_year += (str[i++] - '0') * 10;
@@ -1086,7 +1099,7 @@ openssl_asn1group_get(lua_State *L)
{
ASN1_STRING *s = CHECK_GROUP(1, ASN1_STRING, "openssl.asn1group");
int ret = 0;
- switch (s->type) {
+ switch (ASN1_STRING_type(s)) {
case V_ASN1_INTEGER: {
ASN1_INTEGER *ai = CHECK_OBJECT(1, ASN1_INTEGER, "openssl.asn1_integer");
BIGNUM *bn = ASN1_INTEGER_to_BN(ai, NULL);
@@ -1128,7 +1141,7 @@ openssl_asn1group_i2d(lua_State *L)
break; \
}
- switch (s->type) {
+ switch (ASN1_STRING_type(s)) {
/*
P(ASN1_BOOLEAN);
case V_ASN1_BOOLEAN:
@@ -1220,7 +1233,7 @@ openssl_asn1group_d2i(lua_State *L)
break; \
}
- switch (s->type) {
+ switch (ASN1_STRING_type(s)) {
/*
P(ASN1_BOOLEAN);
case V_ASN1_BOOLEAN:
@@ -1374,7 +1387,8 @@ openssl_asn1group_eq(lua_State *L)
ASN1_STRING *s = CHECK_GROUP(1, ASN1_STRING, "openssl.asn1group");
ASN1_STRING *ss = CHECK_GROUP(2, ASN1_STRING, "openssl.asn1group");
- lua_pushboolean(L, (s->type == ss->type && ASN1_STRING_cmp(s, ss) == 0));
+ lua_pushboolean(L, (ASN1_STRING_type(s) == ASN1_STRING_type(ss)
+ && ASN1_STRING_cmp(s, ss) == 0));
return 1;
}
@@ -1434,7 +1448,7 @@ openssl_asn1group_toprint(lua_State *L)
unsigned long flags = luaL_optint(L, 2, 0);
BIO *out = BIO_new(BIO_s_mem());
BUF_MEM *mem;
- switch (s->type) {
+ switch (ASN1_STRING_type(s)) {
case V_ASN1_UTCTIME: {
ASN1_TIME *a = (ASN1_TIME *)s;
ASN1_TIME_print(out, a);
@@ -1484,7 +1498,7 @@ static int
openssl_asn1group_dup(lua_State *L)
{
ASN1_STRING *s = CHECK_GROUP(1, ASN1_STRING, "openssl.asn1group");
- openssl_push_asn1(L, s, s->type);
+ openssl_push_asn1(L, s, ASN1_STRING_type(s));
return 1;
}
@@ -1517,7 +1531,7 @@ openssl_asn1time_adj(lua_State *L)
int offset_day = luaL_optint(L, 3, 0);
long offset_sec = luaL_optlong(L, 4, 0);
- switch (at->type) {
+ switch (ASN1_STRING_type(at)) {
case V_ASN1_UTCTIME: {
ASN1_UTCTIME *a = (ASN1_UTCTIME *)at;
ASN1_UTCTIME_adj(a, t, offset_day, offset_sec);
@@ -1549,7 +1563,7 @@ openssl_asn1time_diff(lua_State *L)
ASN1_TIME *from = CHECK_OBJECT(1, ASN1_TIME, "openssl.asn1_time");
ASN1_TIME *to = lua_isnoneornil(L, 2) ? NULL : CHECK_OBJECT(2, ASN1_TIME, "openssl.asn1_time");
- luaL_argcheck(L, to->type == from->type, 2, "asn1_time with mismatched type");
+ luaL_argcheck(L, ASN1_STRING_type(to) == ASN1_STRING_type(from), 2, "asn1_time with mismatched type");
ret = ASN1_TIME_diff(&day, &sec, from, to);
if (ret == 1) {
@@ -1644,12 +1658,13 @@ openssl_push_asn1object(lua_State *L, const ASN1_OBJECT *obj)
int
openssl_push_asn1(lua_State *L, const ASN1_STRING *string, int type)
{
- if ((string->type & V_ASN1_GENERALIZEDTIME) == V_ASN1_GENERALIZEDTIME && type == V_ASN1_UTCTIME)
+ int strType = ASN1_STRING_type(string);
+ if ((strType & V_ASN1_GENERALIZEDTIME) == V_ASN1_GENERALIZEDTIME && type == V_ASN1_UTCTIME)
type = V_ASN1_GENERALIZEDTIME;
- else if ((string->type & V_ASN1_UTCTIME) == V_ASN1_UTCTIME && type == V_ASN1_GENERALIZEDTIME)
+ else if ((strType & V_ASN1_UTCTIME) == V_ASN1_UTCTIME && type == V_ASN1_GENERALIZEDTIME)
type = V_ASN1_UTCTIME;
else if (type == V_ASN1_UNDEF)
- type = string->type;
+ type = strType;
switch (type) {
case V_ASN1_INTEGER: {
diff --git a/deps/lua-openssl/src/crl.c b/deps/lua-openssl/src/crl.c
index 4950b4ca..2958daa0 100644
--- a/deps/lua-openssl/src/crl.c
+++ b/deps/lua-openssl/src/crl.c
@@ -770,7 +770,7 @@ static int openssl_crl_parse(lua_State *L)
lua_setfield(L, -2, "sig_alg");
}
- if (sig != NULL && sig->length > 0) {
+ if (sig != NULL && ASN1_STRING_length(sig) > 0) {
PUSH_ASN1_STRING(L, sig);
lua_setfield(L, -2, "signature");
}
@@ -995,16 +995,17 @@ static time_t
ASN1_GetTimeT(const ASN1_TIME *time)
{
struct tm t;
- const char *str = (const char *)time->data;
+ const char *str = ASN1_STRING_get0_data(time);
+ int type = ASN1_STRING_type(time);
size_t i = 0;
memset(&t, 0, sizeof(t));
- if (time->type == V_ASN1_UTCTIME) /* two digit year */ {
+ if (type == V_ASN1_UTCTIME) /* two digit year */ {
t.tm_year = (str[i++] - '0') * 10;
t.tm_year += (str[i++] - '0');
if (t.tm_year < 70) t.tm_year += 100;
- } else if (time->type == V_ASN1_GENERALIZEDTIME) /* four digit year */ {
+ } else if (type == V_ASN1_GENERALIZEDTIME) /* four digit year */ {
t.tm_year = (str[i++] - '0') * 1000;
t.tm_year += (str[i++] - '0') * 100;
t.tm_year += (str[i++] - '0') * 10;
diff --git a/deps/lua-openssl/src/csr.c b/deps/lua-openssl/src/csr.c
index b9aaeece..fd4743e8 100644
--- a/deps/lua-openssl/src/csr.c
+++ b/deps/lua-openssl/src/csr.c
@@ -120,8 +120,8 @@ static int
copy_extensions(X509 *x, X509_REQ *req, int override)
{
STACK_OF(X509_EXTENSION) *exts = NULL;
- X509_EXTENSION *ext, *tmpext;
- ASN1_OBJECT *obj;
+ const X509_EXTENSION *ext, *tmpext;
+ const ASN1_OBJECT *obj;
int i, idx, ret = 0;
if (!x || !req) return 1;
exts = X509_REQ_get_extensions(req);
@@ -138,7 +138,7 @@ copy_extensions(X509 *x, X509_REQ *req, int override)
do {
tmpext = X509_get_ext(x, idx);
X509_delete_ext(x, idx);
- X509_EXTENSION_free(tmpext);
+ X509_EXTENSION_free((X509_EXTENSION*)tmpext);
idx = X509_get_ext_by_OBJ(x, obj, -1);
} while (idx != -1);
}
@@ -157,7 +157,7 @@ static int
X509_REQ_to_X509_ex(X509_REQ *r, int days, EVP_PKEY *pkey, const EVP_MD *md, X509 **x)
{
X509 *ret = NULL;
- X509_NAME *xn = NULL;
+ const X509_NAME *xn = NULL;
EVP_PKEY *pubkey = NULL;
ASN1_TIME *notBefore = NULL, *notAfter = NULL;
ASN1_INTEGER *serial = NULL;
@@ -412,9 +412,21 @@ static int openssl_csr_sign(lua_State *L)
/*
* In the interests of compatibility, I'll make sure that the bit string
* has a 'not-used bits' value of 0
+ *
+ * Instead of directly manipulating the internal flags (which is not allowed
+ * in OpenSSL 4.0+), we use ASN1_BIT_STRING_set_bit to properly manage the
+ * unused bits count. Setting the last bit explicitly ensures the unused
+ * bits count is calculated correctly by OpenSSL.
*/
- sig->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
- sig->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+ if (siglen > 0) {
+ /* Set the last bit of the signature to its current value.
+ * This forces OpenSSL to recalculate and set the unused bits count
+ * to 0 (since the signature is byte-aligned). */
+ int last_bit = (siglen * 8) - 1;
+ int bit_value = (sigdata[siglen - 1] & 1) ? 1 : 0;
+ ASN1_BIT_STRING_set_bit(sig, last_bit, bit_value);
+ }
+
lua_pushboolean(L, 1);
return 1;
} else {
@@ -442,7 +454,7 @@ parse x509_req object as table
static int openssl_csr_parse(lua_State *L)
{
X509_REQ *csr = CHECK_OBJECT(1, X509_REQ, "openssl.x509_req");
- X509_NAME *subject = X509_REQ_get_subject_name(csr);
+ const X509_NAME *subject = X509_REQ_get_subject_name(csr);
STACK_OF(X509_EXTENSION) *exts = X509_REQ_get_extensions(csr);
lua_newtable(L);
@@ -457,7 +469,7 @@ static int openssl_csr_parse(lua_State *L)
PUSH_OBJECT(alg, "openssl.x509_algor");
lua_setfield(L, -2, "sig_alg");
}
- if (sig->length) {
+ if (sig) {
openssl_push_asn1(L, sig, V_ASN1_BIT_STRING);
lua_setfield(L, -2, "signature");
}
@@ -585,7 +597,7 @@ static int openssl_csr_subject(lua_State *L)
int ret = 0;
if (lua_isnone(L, 2)) {
- X509_NAME *xn = X509_REQ_get_subject_name(csr);
+ const X509_NAME *xn = X509_REQ_get_subject_name(csr);
if (xn) {
openssl_push_xname_asobject(L, xn);
ret = 1;
diff --git a/deps/lua-openssl/src/openssl.c b/deps/lua-openssl/src/openssl.c
index 42004449..985b342b 100644
--- a/deps/lua-openssl/src/openssl.c
+++ b/deps/lua-openssl/src/openssl.c
@@ -544,7 +544,9 @@ openssl_initialize()
sizeof(LOPENSSL_VERSION LUA_VERSION OPENSSL_VERSION_TEXT));
#else
OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN |
+#if defined (OPENSSL_INIT_ENGINE_OPENSSL)
OPENSSL_INIT_ENGINE_OPENSSL |
+#endif
OPENSSL_INIT_LOAD_CRYPTO_STRINGS |
OPENSSL_INIT_LOAD_SSL_STRINGS |
OPENSSL_INIT_ADD_ALL_CIPHERS |
diff --git a/deps/lua-openssl/src/private.h b/deps/lua-openssl/src/private.h
index c6010209..00728c6a 100644
--- a/deps/lua-openssl/src/private.h
+++ b/deps/lua-openssl/src/private.h
@@ -332,7 +332,7 @@ int openssl_push_x509_signature(lua_State *L, const X509_ALGOR *alg, const ASN1_
#define PUSH_ASN1_OCTET_STRING(L, s) openssl_push_asn1(L, (ASN1_STRING*)(s), V_ASN1_OCTET_STRING)
#define PUSH_ASN1_STRING(L, s) openssl_push_asn1(L, (ASN1_STRING*)(s), V_ASN1_UNDEF)
-int openssl_push_xname_asobject(lua_State*L, X509_NAME* xname);
+int openssl_push_xname_asobject(lua_State*L, const X509_NAME* xname);
int openssl_push_bit_string_bitname(lua_State* L, const BIT_STRING_BITNAME* name);
ASN1_OBJECT* openssl_get_asn1object(lua_State*L, int idx, int retnil);
diff --git a/deps/lua-openssl/src/ssl.c b/deps/lua-openssl/src/ssl.c
index a71d71fd..9a8598fd 100644
--- a/deps/lua-openssl/src/ssl.c
+++ b/deps/lua-openssl/src/ssl.c
@@ -158,7 +158,7 @@ openssl_ssl_ctx_new(lua_State *L)
method = TLSv1_client_method();
#endif
-#ifndef OPENSSL_NO_SSL3_METHOD
+#if OPENSSL_VERSION_NUMBER < 0x40000000L && !defined(OPENSSL_NO_SSL3_METHOD)
else if (strcmp(meth, "SSLv3") == 0)
method = SSLv3_method();
else if (strcmp(meth, "SSLv3_server") == 0)
diff --git a/deps/lua-openssl/src/x509.c b/deps/lua-openssl/src/x509.c
index 99096090..4dcc960e 100644
--- a/deps/lua-openssl/src/x509.c
+++ b/deps/lua-openssl/src/x509.c
@@ -466,7 +466,7 @@ int openssl_push_x509_signature(lua_State *L, const X509_ALGOR *alg, const ASN1_
if (sig != NULL)
{
lua_pushliteral(L, "sig");
- lua_pushlstring(L, (const char *)sig->data, sig->length);
+ lua_pushlstring(L, ASN1_STRING_get0_data(sig), ASN1_STRING_length(sig));
lua_rawset(L, i==0 ? -3 : i);
}
diff --git a/deps/lua-openssl/src/xalgor.c b/deps/lua-openssl/src/xalgor.c
index 95957b6f..2d7c5668 100644
--- a/deps/lua-openssl/src/xalgor.c
+++ b/deps/lua-openssl/src/xalgor.c
@@ -151,7 +151,7 @@ openssl_xalgor_set(lua_State *L)
obj = OBJ_dup(obj);
if (val) {
val = ASN1_STRING_dup(val);
- ret = X509_ALGOR_set0(alg, obj, val->type, val);
+ ret = X509_ALGOR_set0(alg, obj, ASN1_STRING_type(val), val);
} else {
ret = X509_ALGOR_set0(alg, obj, 0, NULL);
}
diff --git a/deps/lua-openssl/src/xname.c b/deps/lua-openssl/src/xname.c
index f2fa9be6..ed5939df 100644
--- a/deps/lua-openssl/src/xname.c
+++ b/deps/lua-openssl/src/xname.c
@@ -10,7 +10,7 @@ x509.name module to mapping X509_NAME to lua object.
#include "sk.h"
int
-openssl_push_xname_asobject(lua_State *L, X509_NAME *xname)
+openssl_push_xname_asobject(lua_State *L, const X509_NAME *xname)
{
const X509_NAME *dup = X509_NAME_dup(xname);
PUSH_OBJECT(dup, "openssl.x509_name");
diff --git a/deps/lua-openssl/test/helper.lua b/deps/lua-openssl/test/helper.lua
index ea64feb7..0634ea3c 100644
--- a/deps/lua-openssl/test/helper.lua
+++ b/deps/lua-openssl/test/helper.lua
@@ -6,7 +6,7 @@ local M = {}
M.luaopensslv, M.luav, M.opensslv = openssl.version()
M._luaopensslv, M._luav, M._opensslv = openssl.version(true)
M.libressl = M.opensslv:find("^LibreSSL")
-M.openssl3 = M.opensslv:find("^OpenSSL 3")
+M.openssl3 = M.opensslv:find("^OpenSSL 3") or M.opensslv:find("^OpenSSL 4")
function M.sslProtocol(srv, protocol)
protocol = protocol or openssl.ssl.default