diff options
| author | tb <> | 2026-03-28 11:33:33 +0000 |
|---|---|---|
| committer | tb <> | 2026-03-28 11:33:33 +0000 |
| commit | cb80f3489708580ad1f1d4b027d1c0b23fa3f15a (patch) | |
| tree | 22e3e6cbb19100cb12a8911a5f5ef400b6aa6b97 /src | |
| parent | b1196d61eed2da0efb664d4b7f6347181cd227d6 (diff) | |
| download | openbsd-cb80f3489708580ad1f1d4b027d1c0b23fa3f15a.tar.gz openbsd-cb80f3489708580ad1f1d4b027d1c0b23fa3f15a.tar.bz2 openbsd-cb80f3489708580ad1f1d4b027d1c0b23fa3f15a.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libtls/tls_conninfo.c | 6 | ||||
| -rw-r--r-- | src/lib/libtls/tls_verify.c | 6 |
2 files changed, 6 insertions, 6 deletions
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 @@ | |||
| 1 | /* $OpenBSD: tls_conninfo.c,v 1.28 2024/12/10 08:40:30 tb Exp $ */ | 1 | /* $OpenBSD: tls_conninfo.c,v 1.29 2026/03/28 11:33:33 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2015 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2015 Bob Beck <beck@openbsd.org> |
| @@ -89,7 +89,7 @@ tls_get_peer_cert_hash(struct tls *ctx, char **hash) | |||
| 89 | static int | 89 | static int |
| 90 | tls_get_peer_cert_issuer(struct tls *ctx, char **issuer) | 90 | tls_get_peer_cert_issuer(struct tls *ctx, char **issuer) |
| 91 | { | 91 | { |
| 92 | X509_NAME *name = NULL; | 92 | const X509_NAME *name = NULL; |
| 93 | 93 | ||
| 94 | *issuer = NULL; | 94 | *issuer = NULL; |
| 95 | if (ctx->ssl_peer_cert == NULL) | 95 | if (ctx->ssl_peer_cert == NULL) |
| @@ -105,7 +105,7 @@ tls_get_peer_cert_issuer(struct tls *ctx, char **issuer) | |||
| 105 | static int | 105 | static int |
| 106 | tls_get_peer_cert_subject(struct tls *ctx, char **subject) | 106 | tls_get_peer_cert_subject(struct tls *ctx, char **subject) |
| 107 | { | 107 | { |
| 108 | X509_NAME *name = NULL; | 108 | const X509_NAME *name = NULL; |
| 109 | 109 | ||
| 110 | *subject = NULL; | 110 | *subject = NULL; |
| 111 | if (ctx->ssl_peer_cert == NULL) | 111 | 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 @@ | |||
| 1 | /* $OpenBSD: tls_verify.c,v 1.32 2024/12/10 08:40:30 tb Exp $ */ | 1 | /* $OpenBSD: tls_verify.c,v 1.33 2026/03/28 11:33:33 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> | 3 | * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> |
| 4 | * | 4 | * |
| @@ -214,10 +214,10 @@ tls_get_common_name_internal(X509 *cert, char **out_common_name, | |||
| 214 | unsigned int *out_tlserr, const char **out_errstr) | 214 | unsigned int *out_tlserr, const char **out_errstr) |
| 215 | { | 215 | { |
| 216 | unsigned char *utf8_bytes = NULL; | 216 | unsigned char *utf8_bytes = NULL; |
| 217 | X509_NAME *subject_name; | 217 | const X509_NAME *subject_name; |
| 218 | char *common_name = NULL; | 218 | char *common_name = NULL; |
| 219 | int common_name_len; | 219 | int common_name_len; |
| 220 | ASN1_STRING *data; | 220 | const ASN1_STRING *data; |
| 221 | int lastpos = -1; | 221 | int lastpos = -1; |
| 222 | int rv = -1; | 222 | int rv = -1; |
| 223 | 223 | ||
