Page MenuHomeFreeBSD
Files F142738719

D52909.diff
No OneTemporary
Actions

D52909.diff
View Options

diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -108,7 +108,7 @@
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
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -189,8 +189,7 @@
.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
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -681,6 +681,8 @@
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
@@ -3896,8 +3898,6 @@
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
rename from sys/kern/md4c.c
rename to sys/crypto/md4c.c
diff --git a/sys/kern/md5c.c b/sys/crypto/md5c.c
rename from sys/kern/md5c.c
rename to sys/crypto/md5c.c
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
--- 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

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 23, 10:45 PM (1 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27890427
Default Alt Text
D52909.diff (2 KB)

Event Timeline