From nobody Sat Feb 7 14:24:56 2026 X-Original-To: dev-commits-src-main@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 4f7YBc3v4vz6QfJd for ; Sat, 07 Feb 2026 14:24:56 +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 4f7YBc2ngHz3lTH for ; Sat, 07 Feb 2026 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770474296; 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=U6Q0OnnUSp0dHvQpGniONut+y5/+Q810BEqNUuxGe78=; b=PutC+i8W/Z7686fNWBWW3UOMnYkT7HglJfGxCi2lPel/wojDfoSMs2nY48tSuFTcfMmtlM xEmx7WQzLFirTDRgoKS7B7d5KHYAznFRJmKN+ADfuk6UDFHQX06vDeQjycD/EzYsWL/l59 ykAgkzrtPxHdZVX42B7nnUBZ0MItt7IkggEpp880QZatP9jcsJvJETwpfAu76N5SrmUjii K/UX/epTbQ5z6xLjFoa9aOZqS/JoEZsAfpC+Ol6rWPVkd8VPtK+xkJue8tY9kRN8JmHnK+ yez/99N1JcmoyzTFoJtzcJk/XZstpPDEa0E4X+sNqwA07VyVv8mJROSlkW2JZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770474296; a=rsa-sha256; cv=none; b=ymw6BnIR37sODj8uHJoeuMbkW+2AioKmyFKWuPGvMphvn5yhbklWtOsfQa2qwma3AOnywI 5EFejRALHcBpJG00A9GYfNXLhB//WTmpt8M2wyy6uKdsbu1G8sNhy5BoV61VXq18Y/CzuZ wyfVk80tjnlDOxN5U4btE77coPc6RE8c1O8CfIiolo+PGNkn5EatTW/vvZRMl5L8qzJZqc vG1CkJD+w/gzadNcmIpZzc2m0Jr2ksdW+TMii56uoKOc90P7YyqH0K+TffrPKEv9f21Fdd ltMOx2/3AYMjHPvij2zFT+sEm6z6XCwQ9gPN25yjBeRmcwG5tCVsm3vdZPKX7w== 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=1770474296; 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=U6Q0OnnUSp0dHvQpGniONut+y5/+Q810BEqNUuxGe78=; b=VBdCxSS2KMIDceeLMqU77P+o48/TvaLRN7NxIlzqsLYF8kFGhNkw16RJPb7H9LEZtb3NdR 8IXEnRvWZTJqfMhdaHqu7pEqQgUm0a9HxrcL992OhenFAK77U312GAbQTYXn4dvn5J/dTw n2/oMpEdgQH91wBKGG/m+iBB6MQc5My+UQmEw15mihB/gwI3xBFdnLwoCO0NzYo8SVPfG2 qlO086i3l8s5RHdLwPXtBcOrIqgTcJCQf5V0kIe2WGSLsp2BCywWDhqLKPrVXfaWcv3XRO 99IxrACITHekvTE3DT5kaDqVoi8fvUKQJpPB+xKrfLH3Vbulon7g8JvMaSjKkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7YBc20Xzz14t8 for ; Sat, 07 Feb 2026 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e751 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 14:24:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4e160c6197f7 - main - libfetch: Check for failure to create SSL context List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4e160c6197f75fda3d5d5997ce893087058cf718 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 14:24:56 +0000 Message-Id: <69874b38.3e751.131d957f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4e160c6197f75fda3d5d5997ce893087058cf718 commit 4e160c6197f75fda3d5d5997ce893087058cf718 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-07 14:24:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-07 14:24:40 +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 --- 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 9b36a9e61a75..ec010909218b 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 */ };