diff mbox series

[Openvpn-devel,v2] Use const specifices in extract_x509_field_ssl

Message ID 20260326110658.25741-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v2] Use const specifices in extract_x509_field_ssl | expand

Commit Message

Gert Doering March 26, 2026, 11:06 a.m. UTC 
From: Arne Schwabe <arne@rfc2549.org>

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 <arne@rfc2549.org>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1588
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1588
This mail reflects revision 2 of this Change.

Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <frank@lichtenheld.com>

Comments

Gert Doering March 26, 2026, 2:18 p.m. UTC | #1 
Makes sense, is straightforward enough, and for long-term compat, needs
to be in master + 2.7

Your patch has been applied to the master and release/2.7 branch.

commit 3316a18ebe6669d5e31b17ab0356a533b846d1bc (master)
commit 82f676574dce2f391d2cb7332068f0fc6dca5387 (release/2.7)
Author: Arne Schwabe
Date:   Thu Mar 26 12:06:52 2026 +0100

     Use const specifices in extract_x509_field_ssl

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
     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 <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpn/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c
index 46401cd..4c492a3 100644
--- a/src/openvpn/ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.c
@@ -195,8 +195,6 @@ 
 {
     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 @@ 
         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;