From nobody Wed Feb 11 20:38:47 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fB9J80Hslz6SBG4 for ; Wed, 11 Feb 2026 20:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9J73QV9z3MB0 for ; Wed, 11 Feb 2026 20:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STzZXdaegwVgo6z8OFMMVeZguZnP6oHUHVxwK1FZDlM=; b=enVCm9SXG1nBN+DaGEnPHBZUFHs5f+x0ozqQnol9YOqwZlDoHJbwrrwqGba6cNrvw7UfHJ /uo+cLT6OG0tBRpKvF6GOVvfjObah03cHuiva2PvIgoIYYInBJjkMDxEsStNwqjhyOyggw c+OMtZO5gM5AbL95hHSnvNC8Mfxn9XSq8vXeDKU2JvqylhdR39QMbB3IkIW4uRxaSKAoXO eJu0UFMFWEuFm5PP8N3njDes7j5eB8PfNIid9LGQKu4etn+BLG4hO2/4UMEDeR+fDg33Mh 2NPomTA5Odr+zy6psV1AQNmxanQLzgIZ72M9nSNFu1cqGNpfiElLAzPHN9k3Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842327; a=rsa-sha256; cv=none; b=hHQb056+EXNzufo7Iaf4Oop7k7YM7G/ghkT/+AslIoLqrnVDz+Q0oAg5a2yFi8RZz/juYr 7U4MAtzIAO06QCuxg4syejp0YezHxbXBoMmkAYXobWG4pOqH5VV18TgRPEWOJoX4gVtBSm rYzxto1b7ewuZm+krp5aPvL/vI6tIgZ+pGRJEUzCzVMFl89SHO9ymfzWocvNymUl0JLvTB Lz04Q/oFDS5nX3mVUT6XfJUYZVE430y13C2FanZqNeQ78Hp6n43d+TCntKmif9Ln6W4OdE HDbGjWqwkXEz6BA8yglVx2DGSObj8bITdQsEAHJBl+Fo6m/d+JdCh8IxinpG6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STzZXdaegwVgo6z8OFMMVeZguZnP6oHUHVxwK1FZDlM=; b=OpRvLBVKEtTH72bNpfZn/mImxBewdou4Pe5KSNeL/9Jo633bOaQ10SOvaIwreKL4d38mX1 0gczhSBXoCgFylPfZk/By6xudGbFhz6Efj2+iVlVeIcg+tK9mIuL9/XSGXZfeUqtLvt3kq bhD3naBOQ548NCNuTHplAv7ElCm5U3OQa338Uv3SrvPhWdnBImDLKRHCg/GSJYPQw4fCj9 VfMh9jT1dv18D8rFLekwEsI6eBKCdnwhJJ1kdLmaf5N2yNRZ1YkWk4UUO5q2VeBJZrmr69 QNWdBJdVfsdWCE5BZqI9JDUe5ATZCKaep15acGUsbjf8noeXsF5/+9b+U7IzvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9J72P7Wz14V0 for ; Wed, 11 Feb 2026 20:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44ff1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:38:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d653f474e901 - stable/15 - libfetch: Check for failure to create SSL context List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d653f474e901b1d43657b8955247d1bbd1c3d248 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:38:47 +0000 Message-Id: <698ce8d7.44ff1.68d1a45d@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d653f474e901b1d43657b8955247d1bbd1c3d248 commit d653f474e901b1d43657b8955247d1bbd1c3d248 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-07 14:24:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 13:54:39 +0000 libfetch: Check for failure to create SSL context * Drop the ssl_meth member, there is no reason to hang on to it. * Replace deprecated SSLv23_client_method() with TLS_client_method(). * Check the return value from SSL_CTX_new(). MFC after: 1 week PR: 292903 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55098 (cherry picked from commit 4e160c6197f75fda3d5d5997ce893087058cf718) --- lib/libfetch/common.c | 10 +++++++--- lib/libfetch/common.h | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index f59ef9a8bbb0..584973476068 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1182,8 +1182,11 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) X509_NAME *name; char *str; - conn->ssl_meth = SSLv23_client_method(); - conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth); + if ((conn->ssl_ctx = SSL_CTX_new(TLS_client_method())) == NULL) { + fprintf(stderr, "SSL context creation failed\n"); + ERR_print_errors_fp(stderr); + return (-1); + } SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY); fetch_ssl_setup_transport_layer(conn->ssl_ctx, verbose); @@ -1194,7 +1197,8 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) conn->ssl = SSL_new(conn->ssl_ctx); if (conn->ssl == NULL) { - fprintf(stderr, "SSL context creation failed\n"); + fprintf(stderr, "SSL connection creation failed\n"); + ERR_print_errors_fp(stderr); return (-1); } SSL_set_fd(conn->ssl, conn->sd); diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h index 7396c8a68ab6..06089aae5451 100644 --- a/lib/libfetch/common.h +++ b/lib/libfetch/common.h @@ -56,7 +56,6 @@ struct fetchconn { SSL *ssl; /* SSL handle */ SSL_CTX *ssl_ctx; /* SSL context */ X509 *ssl_cert; /* server certificate */ - const SSL_METHOD *ssl_meth; /* SSL method */ #endif int ref; /* reference count */ };