diff options
| author | Warner Losh <imp@FreeBSD.org> | 2024-01-31 23:54:19 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2024-02-02 21:01:03 +0000 |
| commit | fd577b59b2d78a32f40fdc3847666728d8a897db (patch) | |
| tree | 25d252ad72dd1e88aa136e6802f9d1845b0f7854 /stand/libsa | |
| parent | 7c8b126c1a7b30fe690800d7e27b308876711f9d (diff) | |
Diffstat (limited to 'stand/libsa')
| -rw-r--r-- | stand/libsa/Makefile | 9 | ||||
| -rw-r--r-- | stand/libsa/geli/Makefile.inc | 11 |
2 files changed, 9 insertions, 11 deletions
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f7d7778d5653..bc85a3dcb0de 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -180,6 +180,15 @@ SRCS+= explicit_bzero.c crc32_libkern.c .include "${SASRC}/zfs/Makefile.inc" .endif +# Crypto hashing functions +# sha256 and sha512 from sys/crypto +.PATH: ${SYSDIR}/crypto/sha2 +SRCS+= sha256c.c sha512c.c + +# md5 from libmd +.PATH: ${SRCTOP}/lib/libmd +SRCS+= md5c.c + .if ${DO32:U0} == 0 MAN=libsa.3 .endif diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 0d9fcb90bbd8..07600d5287bd 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -5,16 +5,6 @@ # Our password input method SRCS+= pwgets.c -# sha256 and sha512 from sys/crypto -.PATH: ${SYSDIR}/crypto/sha2 -CFLAGS.sha256.c+= -DWEAK_REFS -CFLAGS.sha512.c+= -DWEAK_REFS -SRCS+= sha256c.c sha512c.c - -# md5 from libmd -.PATH: ${SRCTOP}/lib/libmd -SRCS+= md5c.c - # AES implementation from sys/crypto .PATH: ${SYSDIR}/crypto/rijndael .for i in rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c @@ -23,7 +13,6 @@ CFLAGS.${i}+= -DNDEBUG SRCS+= ${i} .endfor - # local GELI Implementation .PATH: ${SYSDIR}/geom/eli .for i in gelidev.c geli_metadata.c |