From cb80f3489708580ad1f1d4b027d1c0b23fa3f15a Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 28 Mar 2026 11:33:33 +0000 Subject: libtls: simple cases of const for X509_NAME * After the const sprinkling in OpenSSL 1.1, X509_get_{issuer,subject}_name() still returned a non-const pointer for unclear reasons. In OpenSSL 4, the return value also grew a const qualifier, so move the two "name" in tls_conninfo.c and the "subject_name" in tls_verify.c to const. They are only used for further processing by already const correct functions (at least as far as X509_NAME is concerned). ok djm jsing kenjiro --- src/lib/libtls/tls_conninfo.c | 6 +++--- src/lib/libtls/tls_verify.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libtls/tls_conninfo.c b/src/lib/libtls/tls_conninfo.c index 8fb56c92b7..5707ec6703 100644 --- a/src/lib/libtls/tls_conninfo.c +++ b/src/lib/libtls/tls_conninfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_conninfo.c,v 1.28 2024/12/10 08:40:30 tb Exp $ */ +/* $OpenBSD: tls_conninfo.c,v 1.29 2026/03/28 11:33:33 tb Exp $ */ /* * Copyright (c) 2015 Joel Sing * Copyright (c) 2015 Bob Beck @@ -89,7 +89,7 @@ tls_get_peer_cert_hash(struct tls *ctx, char **hash) static int tls_get_peer_cert_issuer(struct tls *ctx, char **issuer) { - X509_NAME *name = NULL; + const X509_NAME *name = NULL; *issuer = NULL; if (ctx->ssl_peer_cert == NULL) @@ -105,7 +105,7 @@ tls_get_peer_cert_issuer(struct tls *ctx, char **issuer) static int tls_get_peer_cert_subject(struct tls *ctx, char **subject) { - X509_NAME *name = NULL; + const X509_NAME *name = NULL; *subject = NULL; if (ctx->ssl_peer_cert == NULL) diff --git a/src/lib/libtls/tls_verify.c b/src/lib/libtls/tls_verify.c index 2935278383..de95ab8117 100644 --- a/src/lib/libtls/tls_verify.c +++ b/src/lib/libtls/tls_verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_verify.c,v 1.32 2024/12/10 08:40:30 tb Exp $ */ +/* $OpenBSD: tls_verify.c,v 1.33 2026/03/28 11:33:33 tb Exp $ */ /* * Copyright (c) 2014 Jeremie Courreges-Anglas * @@ -214,10 +214,10 @@ tls_get_common_name_internal(X509 *cert, char **out_common_name, unsigned int *out_tlserr, const char **out_errstr) { unsigned char *utf8_bytes = NULL; - X509_NAME *subject_name; + const X509_NAME *subject_name; char *common_name = NULL; int common_name_len; - ASN1_STRING *data; + const ASN1_STRING *data; int lastpos = -1; int rv = -1; -- cgit v1.2.3-55-g6feb