From: Beat Bolli <dev+git@drbeat.li>
To: git@vger.kernel.org
Cc: Oswald Buddenhagen <ossi@kde.org>, Beat Bolli <dev+git@drbeat.li>
Subject: [PATCH 2/3] imap-send: don't expect an ASN1_STRING to be NUL-terminated
Date: Mon, 7 Sep 2026 23:12:09 +0200 [thread overview]
Message-ID: <20260907211210.2621693-3-dev+git@drbeat.li> (raw)
In-Reply-To: <20260907211210.2621693-1-dev+git@drbeat.li>
As highlighted by a recent OpenSSL commit[1], ASN1_STRINGs were never
documented to be terminated by a NUL byte, but our code treats the
pattern as such in the strcasecmp() call.
Make a NUL-terminated copy to avoid Undefined Behavior.
[1]: https://github.com/openssl/openssl/commit/4b581a4666c3e470a01a7323801b2ba8ccfa478c
(Add a migration entry for ASN1_STRINGs, 2026-08-06)
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
---
imap-send.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/imap-send.c b/imap-send.c
index 977d78005c..9a807cdde8 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -226,20 +226,25 @@ static int ssl_socket_connect(struct imap_socket *sock UNUSED,
static int host_matches(const char *host, const ASN1_STRING *asn1_str)
{
- const char *pattern = (const char *)ASN1_STRING_get0_data(asn1_str);
+ int ret = 0;
+ size_t len = ASN1_STRING_get_length(asn1_str);
+ char *pattern = xmemdupz(ASN1_STRING_get0_data(asn1_str), len);
/* embedded NUL characters may open a security hole */
- if (memchr(pattern, '\0', ASN1_STRING_get_length(asn1_str)))
- return 0;
+ if (memchr(pattern, '\0', len))
+ goto out;
if (pattern[0] == '*' && pattern[1] == '.') {
pattern += 2;
if (!(host = strchr(host, '.')))
- return 0;
+ goto out;
host++;
}
- return *host && *pattern && !strcasecmp(host, pattern);
+ ret = *host && *pattern && !strcasecmp(host, pattern);
+out:
+ free(pattern);
+ return ret;
}
static int verify_hostname(X509 *cert, const char *hostname)
--
2.53.0
next prev parent reply other threads:[~2026-09-07 21:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-07 21:12 [PATCH 0/3] imap-send: future proofing and two correctness fixes Beat Bolli
2026-09-07 21:12 ` [PATCH 1/3] imap-send: prepare for OpenSSL 4.1 Beat Bolli
2026-09-08 4:17 ` Junio C Hamano
2026-09-08 8:26 ` Patrick Steinhardt
2026-09-07 21:12 ` Beat Bolli [this message]
2026-09-08 1:17 ` [PATCH 2/3] imap-send: don't expect an ASN1_STRING to be NUL-terminated Junio C Hamano
2026-09-08 8:26 ` Patrick Steinhardt
2026-09-07 21:12 ` [PATCH 3/3] imap-send: only check the CN if no SAN DNS names are present Beat Bolli
2026-09-08 1:28 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260907211210.2621693-3-dev+git@drbeat.li \
--to=dev+git@drbeat.li \
--cc=git@vger.kernel.org \
--cc=ossi@kde.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.