From nobody Wed Nov 11 10:06:14 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 4jPfLH1TyBz6yyjN for ; Wed, 11 Nov 2026 10:06:15 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPfLH0kf1z4pk8 for ; Wed, 11 Nov 2026 10:06:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794391575; 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=8fKb1NX/HwnntCthKhqh11U/e8u3kA8QnDPMUwbSK70=; b=FBAtML35ufnAS+DGklGLV7zUH9I25Y9jhdotrMrfSq+8/Xrnh0ESOgOp5500IgqBlcmp2U 1sfHIFOALjZ7yIDav+/iaXQ/3rTtR7XN1+aJzi5K3cjzWyHPwfuN1qJ8uuk/toStBGmY5W P9NBha28cFEjvJJ5fXNZ9niwkC1/SbaOgYM0+i6AQdQdlbmCYcy9rlD7pRDSsmP6n8SrJg l209UIPcwPERAWciuVgMekFeSgP7/b2CmWmsQnvCpSG2cb/I5/qtyFXm5QTli1557o2z7n +gc5zMca24vy5nir128UOAd+JmBcS3vEAeZOVgNw+51jTEUzKHS+xw2Cyb90vw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794391575; b=FNrb6o+KWqyLaytGAntiBanjbN7f7sfu8eUORanHtTPQ3JbU+jlyMVokzvREXjeE5UwScM uaTjBNppSIP7lruGu+4Tpw6wVP5bywMLkEA3TsVBtSQgnB+17zKoaAqOLOgPO4uUhtkcF+ 2RGpdbUkX4PMsOUuhJDyy3RdpngYW5NhQNXnH7B3+4/aCtMUQxltpalu89Vkjx4icPAsyG tlSOGrNJcVrAyim7deuOdWuV3QEbTcbHeOjs8AWiiLFd8vUvOpd4wZNU6qNep0+acur6w3 pkvLwb4I8Bv24pp7NZWPyucYJUJmEs6P4emSBv/sIZH30qrLo5Kf263dOgTJzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794391575; 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=8fKb1NX/HwnntCthKhqh11U/e8u3kA8QnDPMUwbSK70=; b=mQ/5NvyRSIO0e+izn5f9S4ZGDLOeJtT9SfMPNdUa+E2Q5qnfgEk10y8Dab42e9/Moje7GB 9UBI08nJ8nLrFLdpPJ0ithMJe9Edu+FEaeMH/QmCAiVzr9ZQ5l33QG+bZzGtV3JmLBv+zo hyvY2P3pNSiKoD0IWP0tGuNmnYFz1t+zusbRTO2MWpKmGeLQ1IKYjhk4nZPjE7MNdOSM42 aMY/2XFthTZ1DaDIyZsmiBWrIyERQ04eRTrmuVAktq793z12idXzOR7SFjbkg9ijlEM6mJ 6oupmASkaS5i1rX8usGB1yhN3JSEjkwuSggB8jyxgR92NmOZ5tWpYVJ1FVubrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPfLG6c7Xz18j6 for ; Wed, 11 Nov 2026 10:06:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1300d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 10:06:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Gordon Tetlow From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 51d910a3e0b4 - main - libfetch: Prepare for OpenSSL 4 List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 51d910a3e0b42e7d147f49776021a868330a1a8a Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 10:06:14 +0000 Message-Id: <6af43e16.1300d.5da4dcb1@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=51d910a3e0b42e7d147f49776021a868330a1a8a commit 51d910a3e0b42e7d147f49776021a868330a1a8a Author: Gordon Tetlow AuthorDate: 2026-11-10 13:48:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-11 10:06:06 +0000 libfetch: Prepare for OpenSSL 4 * Always use libmd's MD5 since it's deprecated in OpenSSL. * Use ASN1_STRING_get_length() instead of ASN1_STRING_length(). --- lib/libfetch/Makefile | 4 +--- lib/libfetch/common.c | 4 ++++ lib/libfetch/http.c | 16 ++++------------ share/mk/src.libnames.mk | 3 +-- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 37767cb5ec89..5eccb3127d42 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -16,11 +16,9 @@ CFLAGS+= -DINET6 .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL -CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD+= ssl crypto -.else -LIBADD+= md .endif +LIBADD+= md CFLAGS+= -DFTP_COMBINE_CWDS diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 023c491aa852..091bef849649 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1009,7 +1009,11 @@ fetch_ssl_verify_altname(STACK_OF(GENERAL_NAME) *altnames, for (i = 0; i < sk_GENERAL_NAME_num(altnames); ++i) { name = sk_GENERAL_NAME_value(altnames, i); ns = (const char *)ASN1_STRING_get0_data(name->d.ia5); +#if OPENSSL_VERSION_NUMBER >= 0x40100000L + nslen = ASN1_STRING_get_length(name->d.ia5); +#else nslen = (size_t)ASN1_STRING_length(name->d.ia5); +#endif if (name->type == GEN_DNS && ip == NULL && fetch_ssl_hname_match(host, strlen(host), ns, nslen)) diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c index feb88f9c1452..04cdc878c191 100644 --- a/lib/libfetch/http.c +++ b/lib/libfetch/http.c @@ -65,10 +65,14 @@ #include #include +#include +#include + #include #include #include #include +#include #include #include #include @@ -79,18 +83,6 @@ #include #include -#ifdef WITH_SSL -#include -#define MD5Init(c) MD5_Init(c) -#define MD5Update(c, data, len) MD5_Update(c, data, len) -#define MD5Final(md, c) MD5_Final(md, c) -#else -#include -#endif - -#include -#include - #include "fetch.h" #include "common.h" #include "httperr.h" diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 081187dbc0e2..4da70218f377 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -367,9 +367,8 @@ _DP_edit= tinfow _DP_execinfo= elf .if ${MK_OPENSSL} != "no" _DP_fetch= ssl crypto -.else -_DP_fetch= md .endif +_DP_fetch+= md .if ${MK_OPENSSH} != "no" _DP_fido2+= crypto z .endif