From 43225f8233784ed99b602a1bd431cc08252aede1 Mon Sep 17 00:00:00 2001 From: Alex Hornung Date: Sat, 21 Aug 2010 13:17:11 +0100 Subject: [PATCH] aesni - Bind into build system & LINT --- sys/config/LINT | 1 + sys/crypto/Makefile | 2 +- sys/platform/pc32/conf/files | 4 ++++ sys/platform/pc64/conf/files | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/config/LINT b/sys/config/LINT index c997e7d622..8a34418ae5 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -2691,6 +2691,7 @@ options UBSEC_RNDTEST # enable rndtest support device glxsb # Geode LX Security Block device padlock # hardware crypto/RNG for VIA C3/C7/Eden +device aesni # hardware crypto/RNG for AES-NI # # ACPI support using the Intel ACPI Component Architecture reference diff --git a/sys/crypto/Makefile b/sys/crypto/Makefile index c13315028a..61286f1ca9 100644 --- a/sys/crypto/Makefile +++ b/sys/crypto/Makefile @@ -19,6 +19,6 @@ SRCS += opt_param.h cryptodev_if.h bus_if.h device_if.h SRCS += opt_ddb.h SRCS += camellia.c camellia-api.c -SUBDIR = rc4 via +SUBDIR = aesni rc4 via .include diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files index a532b894a5..cefae29008 100644 --- a/sys/platform/pc32/conf/files +++ b/sys/platform/pc32/conf/files @@ -58,6 +58,10 @@ bf_enc.o optional ipsec ipsec_esp \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule +crypto/aesni/aesencdec_i386.S optional aesni +crypto/aesni/aeskeys_i386.S optional aesni +crypto/aesni/aesni.c optional aesni +crypto/aesni/aesni_wrap.c optional aesni crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp crypto/des/des_ecb.c optional netsmbcrypto crypto/des/arch/i386/des_enc.S optional netsmbcrypto diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files index 2b082ce0e0..788f670352 100644 --- a/sys/platform/pc64/conf/files +++ b/sys/platform/pc64/conf/files @@ -52,6 +52,10 @@ emulation/linux/x86_64/linux32_sysvec.c optional compat_linux32 # XXX use assembler versions of bf_enc and des_enc crypto/blowfish/bf_enc.c optional ipsec ipsec_esp +crypto/aesni/aesencdec_x86_64.S optional aesni +crypto/aesni/aeskeys_x86_64.S optional aesni +crypto/aesni/aesni.c optional aesni +crypto/aesni/aesni_wrap.c optional aesni crypto/des/des_enc.c optional ipsec ipsec_esp crypto/des/des_ecb.c optional netsmbcrypto crypto/des/des_enc.c optional netsmbcrypto -- 2.41.0