Module Name: src
Committed By: christos
Date: Tue Aug 17 17:29:20 UTC 2021
Modified Files:
src/sys/modules: Makefile
Added Files:
src/sys/modules/blakes2s: Makefile
src/sys/modules/if_wg: Makefile wg.ioconf
src/sys/modules/sodium: Makefile Makefile.sodmod
Log Message:
modules for blake2s libsodium and if_wg
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/blakes2s/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/if_wg/Makefile \
src/sys/modules/if_wg/wg.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/sodium/Makefile \
src/sys/modules/sodium/Makefile.sodmod
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.251 src/sys/modules/Makefile:1.252
--- src/sys/modules/Makefile:1.251 Mon Aug 9 16:49:10 2021
+++ src/sys/modules/Makefile Tue Aug 17 13:29:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.251 2021/08/09 20:49:10 andvar Exp $
+# $NetBSD: Makefile,v 1.252 2021/08/17 17:29:19 christos Exp $
.include <bsd.own.mk>
@@ -27,6 +27,7 @@ SUBDIR+= adosfs
SUBDIR+= aio
SUBDIR+= audio
SUBDIR+= autofs
+SUBDIR+= blake2s
SUBDIR+= blowfish
SUBDIR+= bpf
SUBDIR+= bpf_filter
@@ -100,6 +101,7 @@ SUBDIR+= if_ure
SUBDIR+= if_url
SUBDIR+= if_urndis
SUBDIR+= if_vlan
+SUBDIR+= if_wg
SUBDIR+= iic
SUBDIR+= ip_ecn
SUBDIR+= ipl
@@ -389,6 +391,8 @@ SUBDIR+= cyclic
SUBDIR+= dtrace
.endif
+SUBDIR+= sodium
+
# we need solaris for the dtrace and zfs modules
.if (${MKDTRACE} != "no" || ${MKZFS} != "no")
SUBDIR+= solaris
Added files:
Index: src/sys/modules/blakes2s/Makefile
diff -u /dev/null src/sys/modules/blakes2s/Makefile:1.1
--- /dev/null Tue Aug 17 13:29:20 2021
+++ src/sys/modules/blakes2s/Makefile Tue Aug 17 13:29:20 2021
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2021/08/17 17:29:20 christos Exp $
+
+.include "../Makefile.inc"
+
+KMOD= blake2s
+
+BLAKE2SDIR= $S/crypto/blake2
+CPPFLAGS+= -I${BLAKE2SDIR}
+
+.PATH: ${BLAKE2SDIR}
+SRCS+= blake2s.c
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/if_wg/Makefile
diff -u /dev/null src/sys/modules/if_wg/Makefile:1.1
--- /dev/null Tue Aug 17 13:29:20 2021
+++ src/sys/modules/if_wg/Makefile Tue Aug 17 13:29:20 2021
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2021/08/17 17:29:20 christos Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/net
+
+KMOD= if_wg
+IOCONF= wg.ioconf
+SRCS= if_wg.c
+
+CPPFLAGS+= -DINET
+CPPFLAGS+= -DINET6
+CPPFLAGS+= -DALTQ
+
+WARNS= 3
+
+.include <bsd.kmodule.mk>
Index: src/sys/modules/if_wg/wg.ioconf
diff -u /dev/null src/sys/modules/if_wg/wg.ioconf:1.1
--- /dev/null Tue Aug 17 13:29:20 2021
+++ src/sys/modules/if_wg/wg.ioconf Tue Aug 17 13:29:20 2021
@@ -0,0 +1,7 @@
+# $NetBSD: wg.ioconf,v 1.1 2021/08/17 17:29:20 christos Exp $
+
+ioconf wg
+
+include "conf/files"
+
+pseudo-device wg
Index: src/sys/modules/sodium/Makefile
diff -u /dev/null src/sys/modules/sodium/Makefile:1.1
--- /dev/null Tue Aug 17 13:29:20 2021
+++ src/sys/modules/sodium/Makefile Tue Aug 17 13:29:20 2021
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2021/08/17 17:29:20 christos Exp $
+
+.include "../Makefile.inc"
+
+KMOD= sodium
+
+.include "Makefile.sodmod"
+.include <bsd.kmodule.mk>
Index: src/sys/modules/sodium/Makefile.sodmod
diff -u /dev/null src/sys/modules/sodium/Makefile.sodmod:1.1
--- /dev/null Tue Aug 17 13:29:20 2021
+++ src/sys/modules/sodium/Makefile.sodmod Tue Aug 17 13:29:20 2021
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile.sodmod,v 1.1 2021/08/17 17:29:20 christos Exp $
+
+SODIUMDIR= ${S}/external/isc/libsodium
+SODIUMSRCDIR= ${SODIUMDIR}/dist/src/libsodium
+
+.PATH: ${SODIUMDIR}/src
+SRCS+= glue.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_scalarmult/curve25519/ref10
+SRCS+= x25519_ref10.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_scalarmult/curve25519
+SRCS+= scalarmult_curve25519.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_scalarmult
+SRCS+= crypto_scalarmult.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_onetimeauth/poly1305/donna
+SRCS+= poly1305_donna.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_onetimeauth/poly1305
+SRCS+= onetimeauth_poly1305.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_onetimeauth
+SRCS+= crypto_onetimeauth.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_stream/chacha20/ref
+SRCS+= chacha20_ref.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_stream/chacha20
+SRCS+= stream_chacha20.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_aead/xchacha20poly1305/sodium
+SRCS+= aead_xchacha20poly1305.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_aead/chacha20poly1305/sodium
+SRCS+= aead_chacha20poly1305.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_core/hchacha20
+SRCS+= core_hchacha20.c
+
+.PATH: ${SODIUMSRCDIR}/crypto_core/ed25519/ref10
+SRCS+= ed25519_ref10.c
+
+WARNS= 3
+
+CWARNFLAGS+= -Wall
+CWARNFLAGS+= -Wno-shadow
+CWARNFLAGS+= -Wno-unused-function
+CWARNFLAGS+= -Wno-unused-variable
+
+CPPFLAGS+= -DHAVE_TI_MODE -I${SODIUMDIR}/include
+CPPFLAGS+= -I${SODIUMDIR}/dist/src/libsodium/include/sodium
