From nobody Sun Nov 23 09:44:49 2025 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 4dDkZT4LrKz6Gcq8 for ; Sun, 23 Nov 2025 09:44:49 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDkZT3X1xz3GMG for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891089; 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=n3iu/4DNMR2mJ4wopjJSc0+tgKK+6awly0OA0uK3USM=; b=kmlTDURmyVTVaSxCQsUo80TRPHqluXPOAtJOvQZsLgQiIi1d1v1PM3XXT8w7DzAosd5ZP9 F+Z2mLxnmYrCdOgMo3wec/0iCu8tzz09Ct+7K1ILWVTH6EeznOIKnKwA5/61RjCOOrWarS h7dtS6YTvVRZwrE8767/INjpGCSoSEOSx8Ig6Q/geBY8aT4baiUvxowLFxfh4MSw8ImMRq LmwDe2CeZeEGB/fwqLMY4LwC6bLj/QVCPXNRtPepJDduZV9cwOtYMjCCIgQR1eFYS24Pz7 f+4m+KbnWW5hTWzI/7fGjDNmJGI33fn06JnvHy6k4a2dugHA+ZeFCHdZYHyZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763891089; 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=n3iu/4DNMR2mJ4wopjJSc0+tgKK+6awly0OA0uK3USM=; b=UfZVPw1mIS5oPJK5rohy1OnDNEwyG7ha8UAICcb9r3pNm+e4ES+7tE3hlyGqwsngGM9K+e yovVd22tbcYBH34YwoNl6c1CrpiL5aU/3ZEckqchtk/vzRMtS22k604ZgXqvJokVxck2kE 1T9oSyMFkDm5HL+XWXf4rH8Ju1Mc7ZKXwUW+ooK/HupbKQ4iO0JBYWfAXDb5TsWhbY74rI mc276Je0toyEbDc6S1lqClO/jfUPlYtq1qjmXuM6+mYgt3vVY3/FTbQbcQn/CstfkETD6I MfSS9WjDPafplERR/oOoKjQJNfj+5+koViusDZxQ2SaZat9MQCQsD9kODctwvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763891089; a=rsa-sha256; cv=none; b=rOyv48yuqfHkLPC/bySAK0UKVbJLIVG2ipOTmQCZgpw4vhaYfi/AeXKovN7UM/dyh1i/jj 6JxLSg2US8YtxKqTUFCZwCUROXy26XRpDtGn9DJXAAW42W2xGJAbUx8Oh356LeglkTUckS gCGd2+VjN4BAlInyJvF4wZe/wy2Ur5gmoHIqt2Z//I6ZO/3/ttOWXrUmo8GiS1i4o0mI9Q 4rsR5XzRSMLRo8u1wVwjESsIE/yU3MxhGDgusMsrXrieEUeGc/aEI7w4ym+U2pUbuNbO+J ORVMxoB7Iu2adsMEVUTVDtygT5HXdvx6TWbG7q3N6stiHyLEgIC1da8IWZZRLA== 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 4dDkZT2sQDz7Xx for ; Sun, 23 Nov 2025 09:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36588 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 09:44:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5a566616e662 - stable/15 - sys: move sys/kern/md[45].c to sys/crypto 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: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5a566616e66244ea69b8f3d034430ca7ea6fc1c7 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 09:44:49 +0000 Message-Id: <6922d791.36588.753a2557@gitrepo.freebsd.org> The branch stable/15 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a566616e66244ea69b8f3d034430ca7ea6fc1c7 commit 5a566616e66244ea69b8f3d034430ca7ea6fc1c7 Author: Robert Clausecker AuthorDate: 2025-10-04 21:40:33 +0000 Commit: Robert Clausecker CommitDate: 2025-11-23 01:12:34 +0000 sys: move sys/kern/md[45].c to sys/crypto Both files are used by kernel and userspace. Move them to sys/crypto where they belong. No functional changes intended. In preparation of D45670. Reviewed by: markj Approved by: markj (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D52909 (cherry picked from commit 73a9b273d3d315716304c2cc237fef3141a93f2a) --- lib/libmd/Makefile | 2 +- stand/libsa/Makefile | 3 +-- sys/conf/files | 4 ++-- sys/{kern => crypto}/md4c.c | 0 sys/{kern => crypto}/md5c.c | 0 sys/modules/smbfs/Makefile | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 547a134fc440..59a519a882af 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -108,7 +108,7 @@ CFLAGS+= -DWEAK_REFS CFLAGS.skein_block.c+= -DSKEIN_LOOP=995 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2 .PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} -.PATH: ${SRCTOP}/sys/kern +.PATH: ${SRCTOP}/sys/crypto USE_ASM_SOURCES?=1 .if defined(BOOTSTRAPPING) || ${MK_MACHDEP_OPTIMIZATIONS} == no diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f5a1acea843e..c1e03c7a5789 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -189,8 +189,7 @@ SRCS+= g_eli_hmac.c pkcs5v2.c .PATH: ${SYSDIR}/crypto/sha2 SRCS+= sha256c.c sha512c.c -# md5 from the kernel -.PATH: ${SYSDIR}/kern +.PATH: ${SYSDIR}/crypto SRCS+= md5c.c .if ${DO32:U0} == 0 diff --git a/sys/conf/files b/sys/conf/files index da5e22e0669b..297698fd7489 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -681,6 +681,8 @@ crypto/curve25519.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" crypto/des/des_ecb.c optional netsmb crypto/des/des_setkey.c optional netsmb +crypto/md4c.c optional netsmb +crypto/md5c.c standard crypto/openssl/ossl.c optional ossl crypto/openssl/ossl_aes.c optional ossl crypto/openssl/ossl_chacha20.c optional ossl @@ -3900,8 +3902,6 @@ kern/kern_vnodedumper.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/linker_if.m standard -kern/md4c.c optional netsmb -kern/md5c.c standard kern/p1003_1b.c standard kern/posix4_mib.c standard kern/sched_4bsd.c optional sched_4bsd diff --git a/sys/kern/md4c.c b/sys/crypto/md4c.c similarity index 100% rename from sys/kern/md4c.c rename to sys/crypto/md4c.c diff --git a/sys/kern/md5c.c b/sys/crypto/md5c.c similarity index 100% rename from sys/kern/md5c.c rename to sys/crypto/md5c.c diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index c796fb0701c5..5ef13757e621 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,6 +1,6 @@ -.PATH: ${SRCTOP}/sys/crypto/des \ +.PATH: ${SRCTOP}/sys/crypto \ + ${SRCTOP}/sys/crypto/des \ ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ - ${SRCTOP}/sys/kern \ ${SRCTOP}/sys/libkern \ ${SRCTOP}/sys/netsmb \ ${SRCTOP}/sys/fs/smbfs