From: Beat Bolli <dev+git@drbeat.li>
To: git@vger.kernel.org
Cc: Xiangfei Ding <xfding@google.com>,
Aniket Gupta <aniketgupta3001@gmail.com>,
Patrick Steinhardt <ps@pks.im>,
Junio C Hamano <gitster@pobox.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Beat Bolli <dev+git@drbeat.li>
Subject: [PATCH v3 3/3] imap-send: prepare for OpenSSL 4.0
Date: Sat, 17 Oct 2026 12:09:56 +0200 [thread overview]
Message-ID: <20261017100956.529225-3-dev+git@drbeat.li> (raw)
In-Reply-To: <20261017100956.529225-1-dev+git@drbeat.li>
OpenSSL 4.0 deprecated the SSL_set1_host function if favor of the new
function SSL_set1_dnsname, which fortunately takes the same parameters.
Add compatibility #defines for the function and its string variant for
the error message.
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
---
imap-send.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/imap-send.c b/imap-send.c
index ec4e28e423..526bde2f55 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -248,6 +248,13 @@ static int verify_peer(const SSL *ssl, int did_connect)
return 0;
}
+#if (OPENSSL_VERSION_NUMBER < 0x40000000L)
+#define SSL_set1_dnsname(ssl, host) SSL_set1_host((ssl), (host))
+#define SSL_SET_DNSNAME_FN "SSL_set1_host"
+#else
+#define SSL_SET_DNSNAME_FN "SSL_set1_dnsname"
+#endif
+
static int ssl_socket_connect(struct imap_socket *sock,
const struct imap_server_conf *cfg,
int use_tls_only)
@@ -290,8 +297,8 @@ static int ssl_socket_connect(struct imap_socket *sock,
if (cfg->ssl_verify) {
/* follow RFC 9525 section 6.3: no partial wildcards */
SSL_set_hostflags(sock->ssl, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
- if (!SSL_set1_host(sock->ssl, cfg->host)) {
- ssl_socket_perror("SSL_set1_host");
+ if (!SSL_set1_dnsname(sock->ssl, cfg->host)) {
+ ssl_socket_perror(SSL_SET_DNSNAME_FN);
return -1;
}
SSL_set_verify(sock->ssl, SSL_VERIFY_PEER, NULL);
--
2.53.0
next prev parent reply other threads:[~2026-10-17 10:10 UTC|newest]
Thread overview: 19+ 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-14 9:10 ` Beat Bolli
2026-09-23 12:32 ` Patrick Steinhardt
2026-09-07 21:12 ` [PATCH 2/3] imap-send: don't expect an ASN1_STRING to be NUL-terminated Beat Bolli
2026-09-08 1:17 ` 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
2026-10-12 20:30 ` [PATCH v2 1/2] imap-send: use the recommended TLS_method() Beat Bolli
2026-10-17 10:09 ` [PATCH v3 1/3] " Beat Bolli
2026-10-17 10:09 ` [PATCH v3 2/3] imap-send: let OpenSSL do the hostname verification Beat Bolli
2026-10-17 10:09 ` Beat Bolli [this message]
2026-10-12 20:30 ` [PATCH v2 2/2] " Beat Bolli
2026-10-12 22:00 ` Aniket Gupta
2026-10-16 10:56 ` Xiangfei Ding
2026-10-13 13:14 ` Patrick Steinhardt
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=20261017100956.529225-3-dev+git@drbeat.li \
--to=dev+git@drbeat.li \
--cc=aniketgupta3001@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
--cc=sandals@crustytoothpaste.net \
--cc=xfding@google.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox