Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F107602005
D46634.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
725 B
Referenced Files
None
Subscribers
None
D46634.diff
View Options
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -164,6 +164,10 @@
.PATH: ${SYSDIR}/libkern
SRCS+= explicit_bzero.c crc32_libkern.c
+# Bits from GELI which are reused elsewhere
+.PATH: ${SYSDIR}/geom/eli
+SRCS+= g_eli_hmac.c pkcs5v2.c
+
# Maybe GELI
.if ${MK_LOADER_GELI} == "yes"
.include "${SASRC}/geli/Makefile.inc"
diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc
--- a/stand/libsa/geli/Makefile.inc
+++ b/stand/libsa/geli/Makefile.inc
@@ -21,10 +21,8 @@
.endfor
SRCS+= geliboot.c \
geliboot_crypto.c \
- g_eli_hmac.c \
g_eli_key.c \
g_eli_key_cache.c \
- pkcs5v2.c \
# aes
.PATH: ${SYSDIR}/opencrypto
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jan 17, 12:16 PM (19 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15838561
Default Alt Text
D46634.diff (725 B)
Attached To
Mode
D46634: loader: Make pkcs5v2 unconditionally available
Attached
Detach File
Event Timeline
Log In to Comment