From nobody Wed Feb 11 20:42:07 2026 X-Original-To: dev-commits-src-branches@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 4fB9N01MZvz6SBJK for ; Wed, 11 Feb 2026 20:42:08 +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 4fB9Mz5mRyz3Mlr for ; Wed, 11 Feb 2026 20:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqRDp9IR+lvNQpd10h/5G0ZEn/UbzLjvgRhmOM6a8IM=; b=myBdpwPljc0nluCjMIUAlPyg4KbQRWXVISCKVvJy1+w9jzmrBqqN2FxS9MR/9yB9RIkefS 9qFzXyIA1p02d3grvx0PSv7xmbMvu3DLCaXzOVKB6GiQQAN5dhO1JjZAGbXcpqBq66MglM YCJlBGhngRU+DNsV56fb0SrqV5PncW3c6XYhtZRbsoOv0jVAfE9x4rb62x2rqPRFYbUhWF CmCxq1l5cXw0WGNDawiOSfMyb7dbs/tfHKXDr+oTCq9OBuEwWQ+x9HJog4jf9OZsD1Ko/Z nluYurtKjj0mhmFjY+1VcS7sGlPzwmQ+pqyTAY8S6/YyYc9SMFmczDXYLH+I9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842527; a=rsa-sha256; cv=none; b=vkkIZiW3Kt4PVFDd0vD7dm/oWbO2Oj7uB1TuDdoq3oRo74sdWLlqmdZyPU0E261lwrdVVO 5LD0xgGPsAwmTSnVUAGM8GEdaz9juUhvk+hhqU56NJ2xSROkryMByIfXnbOBYf8ymdx6hX Z30e4NGrkL+cT0ysKz+6AdUsKu9Wf7IXkGu/mjBJSrpg14MR4lkLSpo93YrgB0GfmgTDpK beeOGP6QUiBjMNejt6ZMrKnlSgp4xnp54C73F1+a2G/OHnDFTRWRh5+uLOMq+t+XlaMgPb H9Yo9Y2j/16niq185n9tWEZlky8cqIODltXTECh1y5yPzvJMmcrZenTRxGUTsw== 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=1770842527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqRDp9IR+lvNQpd10h/5G0ZEn/UbzLjvgRhmOM6a8IM=; b=uDtatu6Wle+NlwyBfjyCI7puRZGn9XBHBc4TbJNuoP0z1nHj0evkHO1SZNjLm9Id7UQPhB KXzWICBhjdM5a2fMeVoPqAHs9IT3D42KJ4BBjcBgXMVa9eyczFBde6XBjhu28AU/jWT06v MWmGYiMA6+0ON+E9t4gQGb4hyNGYDg0C0OxSlJFouqTDnewbbUFLGAt4GAOKN0spVsPa6u gSBSF8Nqn6eWc03C6N3fMZ6IaRw6o7QO2+PgrTKsfO6JF+Y6KujAHBOvPFTOAwBpiWDPGM Jg5LJ6xuQP8n0ZQs8jeSGZiUzn8vIfuv1V4U5PYcVcJWhBed7Njkgh+7lGWEWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9Mz5MD9z14Qx for ; Wed, 11 Feb 2026 20:42:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47b94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:42:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Enji Cooper From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: e20dba3a212d - stable/13 - libfetch: remove all old OpenSSL support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: e20dba3a212d9e114c697b31ae9104e21a03a6d2 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:42:07 +0000 Message-Id: <698ce99f.47b94.7963d8cf@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e20dba3a212d9e114c697b31ae9104e21a03a6d2 commit e20dba3a212d9e114c697b31ae9104e21a03a6d2 Author: Enji Cooper AuthorDate: 2023-06-22 03:53:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 13:53:30 +0000 libfetch: remove all old OpenSSL support This change removes pre-OpenSSL 1.1 supporting code and removes/adjusted preprocessor conditionals which were tautilogically true as FreeBSD main has shipped with OpenSSL 1.1+ for some time. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40711 (cherry picked from commit bc1027a7785166fde9c2a3b48e6e70d198377d4b) --- lib/libfetch/common.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 3a7aba160206..723cba62bb57 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -948,24 +948,8 @@ fetch_ssl_verify_altname(STACK_OF(GENERAL_NAME) *altnames, const char *ns; for (i = 0; i < sk_GENERAL_NAME_num(altnames); ++i) { -#if OPENSSL_VERSION_NUMBER < 0x10000000L - /* - * This is a workaround, since the following line causes - * alignment issues in clang: - * name = sk_GENERAL_NAME_value(altnames, i); - * OpenSSL explicitly warns not to use those macros - * directly, but there isn't much choice (and there - * shouldn't be any ill side effects) - */ - name = (GENERAL_NAME *)SKM_sk_value(void, altnames, i); -#else name = sk_GENERAL_NAME_value(altnames, i); -#endif -#if OPENSSL_VERSION_NUMBER < 0x10100000L - ns = (const char *)ASN1_STRING_data(name->d.ia5); -#else ns = (const char *)ASN1_STRING_get0_data(name->d.ia5); -#endif nslen = (size_t)ASN1_STRING_length(name->d.ia5); if (name->type == GEN_DNS && ip == NULL && @@ -1196,16 +1180,6 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) X509_NAME *name; char *str; -#if OPENSSL_VERSION_NUMBER < 0x10100000L - /* Init the SSL library and context */ - if (!SSL_library_init()){ - fprintf(stderr, "SSL library init failed\n"); - return (-1); - } - - SSL_load_error_strings(); -#endif - conn->ssl_meth = SSLv23_client_method(); conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth); SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY); @@ -1223,7 +1197,7 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose) } SSL_set_fd(conn->ssl, conn->sd); -#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) +#if !defined(OPENSSL_NO_TLSEXT) if (!SSL_set_tlsext_host_name(conn->ssl, __DECONST(struct url *, URL)->host)) { fprintf(stderr,