From 82f676574dce2f391d2cb7332068f0fc6dca5387 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 26 Mar 2026 12:06:52 +0100 Subject: [PATCH] Use const specifices in extract_x509_field_ssl The new OpenSSL 4.0 will return const objects from these objects, so make them const in our code as well. Change-Id: Ia43bb88d9ddf2e82c638011353a64c770f2c2c0a Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1588 Message-Id: <20260326110658.25741-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36291.html Signed-off-by: Gert Doering (cherry picked from commit 3316a18ebe6669d5e31b17ab0356a533b846d1bc) --- src/openvpn/ssl_verify_openssl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c index d96879bd..08946cdc 100644 --- a/src/openvpn/ssl_verify_openssl.c +++ b/src/openvpn/ssl_verify_openssl.c @@ -195,8 +195,6 @@ extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out, size_ { int lastpos = -1; int tmp = -1; - X509_NAME_ENTRY *x509ne = NULL; - ASN1_STRING *asn1 = NULL; unsigned char *buf = NULL; ASN1_OBJECT *field_name_obj = OBJ_txt2obj(field_name, 0); @@ -222,13 +220,13 @@ extract_x509_field_ssl(X509_NAME *x509, const char *field_name, char *out, size_ return FAILURE; } - x509ne = X509_NAME_get_entry(x509, lastpos); + const X509_NAME_ENTRY *x509ne = X509_NAME_get_entry(x509, lastpos); if (!x509ne) { return FAILURE; } - asn1 = X509_NAME_ENTRY_get_data(x509ne); + const ASN1_STRING *asn1 = X509_NAME_ENTRY_get_data(x509ne); if (!asn1) { return FAILURE;