12 files changed, 59 insertions, 13 deletions
diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile
index 26dbedc..6fdfc7e 100644
--- a/sys/modules/aesni/Makefile
+++ b/sys/modules/aesni/Makefile
@@ -7,13 +7,18 @@ SRCS=	aesni.c
 SRCS+=	aeskeys_${MACHINE_CPUARCH}.S
 SRCS+=	device_if.h bus_if.h opt_bus.h cryptodev_if.h
 
-OBJS+=	aesni_wrap.o
+OBJS+=	aesni_ghash.o aesni_wrap.o
 
 # Remove -nostdinc so we can get the intrinsics.
+aesni_ghash.o: aesni_ghash.c
+	# XXX - gcc won't understand -mpclmul
+	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \
+	     -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}
+	${CTFCONVERT_CMD}
+
 aesni_wrap.o: aesni_wrap.c
 	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \
-	     -mmmx -msse -maes ${.IMPSRC}
+	     -mmmx -msse -msse4 -maes ${.IMPSRC}
 	${CTFCONVERT_CMD}
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 6a37c10..9153445 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -3,19 +3,23 @@
 .PATH:	${.CURDIR}/../../opencrypto
 .PATH:	${.CURDIR}/../../crypto
 .PATH:	${.CURDIR}/../../crypto/blowfish
+.PATH:	${.CURDIR}/../../crypto/camellia
 .PATH:	${.CURDIR}/../../crypto/des
 .PATH:	${.CURDIR}/../../crypto/rijndael
 .PATH:	${.CURDIR}/../../crypto/sha2
-.PATH:	${.CURDIR}/../../crypto/camellia
+.PATH:	${.CURDIR}/../../crypto/siphash
 
 KMOD	= crypto
 SRCS	= crypto.c cryptodev_if.c
 SRCS	+= criov.c cryptosoft.c xform.c
 SRCS	+= cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
 SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
+SRCS	+= camellia.c camellia-api.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
-SRCS	+= sha1.c sha2.c
+SRCS	+= sha1.c sha2.c sha256c.c
+SRCS	+= siphash.c
+SRCS	+= gmac.c gfmult.c
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
-SRCS	+= opt_ddb.h opt_kdtrace.h
-SRCS	+= camellia.c camellia-api.c
+SRCS	+= opt_ddb.h
+
 .include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile
index 089126e..5c5a590 100644
--- a/sys/modules/geom/geom_bde/Makefile
+++ b/sys/modules/geom/geom_bde/Makefile
@@ -6,6 +6,6 @@
 
 KMOD=	geom_bde
 SRCS=	g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c
-SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/gpioapu/Makefile b/sys/modules/gpioapu/Makefile
new file mode 100644
index 0000000..80fdd2c
--- /dev/null
+++ b/sys/modules/gpioapu/Makefile
@@ -0,0 +1,7 @@
+
+.PATH:  ${.CURDIR}/../../dev/gpioapu
+KMOD    = gpioapu
+SRCS    = gpioapu.c
+SRCS    += device_if.h bus_if.h pci_if.h isa_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile
index 9075edb..9f8009c 100644
--- a/sys/modules/iwnfw/Makefile
+++ b/sys/modules/iwnfw/Makefile
@@ -1,5 +1,17 @@
 # $FreeBSD$
 
-SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050 iwn2030
+SUBDIR=	iwn100		\
+	iwn105		\
+	iwn135		\
+	iwn1000		\
+	iwn2000		\
+	iwn2030		\
+	iwn4965		\
+	iwn5000		\
+	iwn5150		\
+	iwn6000		\
+	iwn6000g2a	\
+	iwn6000g2b	\
+	iwn6050
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/iwnfw/iwn100/Makefile b/sys/modules/iwnfw/iwn100/Makefile
new file mode 100644
index 0000000..c72533f
--- /dev/null
+++ b/sys/modules/iwnfw/iwn100/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	iwn100fw
+IMG=	iwlwifi-100-39.31.5.1
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwnfw/iwn105/Makefile b/sys/modules/iwnfw/iwn105/Makefile
new file mode 100644
index 0000000..f1f3d8d
--- /dev/null
+++ b/sys/modules/iwnfw/iwn105/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	iwn105fw
+IMG=	iwlwifi-105-6-18.168.6.1
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwnfw/iwn135/Makefile b/sys/modules/iwnfw/iwn135/Makefile
new file mode 100644
index 0000000..fd21ac4
--- /dev/null
+++ b/sys/modules/iwnfw/iwn135/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+KMOD=	iwn135fw
+IMG=	iwlwifi-135-6-18.168.6.1
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwnfw/iwn6000g2b/Makefile b/sys/modules/iwnfw/iwn6000g2b/Makefile
index 71a2607..ce76755 100644
--- a/sys/modules/iwnfw/iwn6000g2b/Makefile
+++ b/sys/modules/iwnfw/iwn6000g2b/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	iwn6000g2bfw
-IMG=	iwlwifi-6000g2b-17.168.5.2
+IMG=	iwlwifi-6000g2b-18.168.6.1
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index 332515d..6bf47f2 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -12,7 +12,7 @@ SRCS+=	ivy.c
 .endif
 SRCS+=	randomdev_soft.c yarrow.c hash.c
 SRCS+=	random_harvestq.c live_entropy_sources.c rwfile.c
-SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
+SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c sha256c.c
 SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h
 
 CFLAGS+= -I${.CURDIR}/../..
diff --git a/sys/modules/wpi/Makefile b/sys/modules/wpi/Makefile
index 1e2383f..2e0da73 100644
--- a/sys/modules/wpi/Makefile
+++ b/sys/modules/wpi/Makefile
@@ -3,6 +3,6 @@
 .PATH:  ${.CURDIR}/../../dev/wpi
 
 KMOD    = if_wpi
-SRCS    = if_wpi.c device_if.h bus_if.h pci_if.h opt_wlan.h
+SRCS    = if_wpi.c device_if.h bus_if.h pci_if.h opt_wpi.h opt_wlan.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index ea8bd45..5c363f9 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -72,7 +72,7 @@ SRCS+=	zmod_subr.c
 SRCS+=	zutil.c
 
 .PATH:	${.CURDIR}/../../crypto/sha2
-SRCS+=	sha2.c
+SRCS+=	sha2.c sha256c.c
 
 .PATH:	${SUNW}/common/zfs
 .include "${SUNW}/uts/common/Makefile.files"