From ceab6f8f34ade706eb0085357f218c730fa1f1f1 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 13 Jun 2011 00:09:48 +0200 Subject: [PATCH] kernel: Move aesni(4) and padlock(4) from sys/crypto to sys/dev/crypto. Pointed-out-by: alexh --- sys/conf/files | 8 ++++---- sys/crypto/Makefile | 2 +- sys/dev/crypto/Makefile | 5 +---- sys/{ => dev}/crypto/aesni/Makefile | 0 sys/{ => dev}/crypto/aesni/aesencdec_i386.S | 0 sys/{ => dev}/crypto/aesni/aesencdec_x86_64.S | 0 sys/{ => dev}/crypto/aesni/aeskeys_i386.S | 0 sys/{ => dev}/crypto/aesni/aeskeys_x86_64.S | 0 sys/{ => dev}/crypto/aesni/aesni.c | 2 +- sys/{ => dev}/crypto/aesni/aesni.h | 0 sys/{ => dev}/crypto/aesni/aesni_wrap.c | 2 +- sys/{crypto/via => dev/crypto/padlock}/Makefile | 0 sys/{crypto/via => dev/crypto/padlock}/padlock.c | 2 +- sys/{crypto/via => dev/crypto/padlock}/padlock.h | 0 sys/{crypto/via => dev/crypto/padlock}/padlock_cipher.c | 2 +- sys/{crypto/via => dev/crypto/padlock}/padlock_hash.c | 2 +- sys/platform/pc32/conf/files | 8 ++++---- sys/platform/pc64/conf/files | 8 ++++---- 18 files changed, 19 insertions(+), 22 deletions(-) rename sys/{ => dev}/crypto/aesni/Makefile (100%) rename sys/{ => dev}/crypto/aesni/aesencdec_i386.S (100%) rename sys/{ => dev}/crypto/aesni/aesencdec_x86_64.S (100%) rename sys/{ => dev}/crypto/aesni/aeskeys_i386.S (100%) rename sys/{ => dev}/crypto/aesni/aeskeys_x86_64.S (100%) rename sys/{ => dev}/crypto/aesni/aesni.c (99%) rename sys/{ => dev}/crypto/aesni/aesni.h (100%) rename sys/{ => dev}/crypto/aesni/aesni_wrap.c (99%) rename sys/{crypto/via => dev/crypto/padlock}/Makefile (100%) rename sys/{crypto/via => dev/crypto/padlock}/padlock.c (99%) rename sys/{crypto/via => dev/crypto/padlock}/padlock.h (100%) rename sys/{crypto/via => dev/crypto/padlock}/padlock_cipher.c (99%) rename sys/{crypto/via => dev/crypto/padlock}/padlock_hash.c (99%) diff --git a/sys/conf/files b/sys/conf/files index d23fac8982..798b0b8f3d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1921,11 +1921,11 @@ opencrypto/deflate.c optional crypto opencrypto/rmd160.c optional crypto opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto -dev/crypto/ubsec/ubsec.c optional ubsec dev/crypto/hifn/hifn7751.c optional hifn -crypto/via/padlock.c optional padlock -crypto/via/padlock_cipher.c optional padlock -crypto/via/padlock_hash.c optional padlock +dev/crypto/padlock/padlock.c optional padlock +dev/crypto/padlock/padlock_cipher.c optional padlock +dev/crypto/padlock/padlock_hash.c optional padlock +dev/crypto/ubsec/ubsec.c optional ubsec dev/drm/ati_pcigart.c optional drm dev/drm/drm_agpsupport.c optional drm dev/drm/drm_auth.c optional drm diff --git a/sys/crypto/Makefile b/sys/crypto/Makefile index 61286f1ca9..4e804a2c81 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 = aesni rc4 via +SUBDIR = rc4 .include diff --git a/sys/dev/crypto/Makefile b/sys/dev/crypto/Makefile index 17084b7ef5..8d4610eff2 100644 --- a/sys/dev/crypto/Makefile +++ b/sys/dev/crypto/Makefile @@ -1,6 +1,3 @@ -# $DragonFly: src/sys/dev/crypto/Makefile,v 1.1 2003/08/15 08:32:28 dillon Exp $ -# - -SUBDIR=cryptodev glxsb hifn ubsec +SUBDIR= aesni cryptodev glxsb hifn padlock ubsec .include diff --git a/sys/crypto/aesni/Makefile b/sys/dev/crypto/aesni/Makefile similarity index 100% rename from sys/crypto/aesni/Makefile rename to sys/dev/crypto/aesni/Makefile diff --git a/sys/crypto/aesni/aesencdec_i386.S b/sys/dev/crypto/aesni/aesencdec_i386.S similarity index 100% rename from sys/crypto/aesni/aesencdec_i386.S rename to sys/dev/crypto/aesni/aesencdec_i386.S diff --git a/sys/crypto/aesni/aesencdec_x86_64.S b/sys/dev/crypto/aesni/aesencdec_x86_64.S similarity index 100% rename from sys/crypto/aesni/aesencdec_x86_64.S rename to sys/dev/crypto/aesni/aesencdec_x86_64.S diff --git a/sys/crypto/aesni/aeskeys_i386.S b/sys/dev/crypto/aesni/aeskeys_i386.S similarity index 100% rename from sys/crypto/aesni/aeskeys_i386.S rename to sys/dev/crypto/aesni/aeskeys_i386.S diff --git a/sys/crypto/aesni/aeskeys_x86_64.S b/sys/dev/crypto/aesni/aeskeys_x86_64.S similarity index 100% rename from sys/crypto/aesni/aeskeys_x86_64.S rename to sys/dev/crypto/aesni/aeskeys_x86_64.S diff --git a/sys/crypto/aesni/aesni.c b/sys/dev/crypto/aesni/aesni.c similarity index 99% rename from sys/crypto/aesni/aesni.c rename to sys/dev/crypto/aesni/aesni.c index b9b77d1842..bc5902da7e 100644 --- a/sys/crypto/aesni/aesni.c +++ b/sys/dev/crypto/aesni/aesni.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "cryptodev_if.h" struct aesni_softc { diff --git a/sys/crypto/aesni/aesni.h b/sys/dev/crypto/aesni/aesni.h similarity index 100% rename from sys/crypto/aesni/aesni.h rename to sys/dev/crypto/aesni/aesni.h diff --git a/sys/crypto/aesni/aesni_wrap.c b/sys/dev/crypto/aesni/aesni_wrap.c similarity index 99% rename from sys/crypto/aesni/aesni_wrap.c rename to sys/dev/crypto/aesni/aesni_wrap.c index 3cb3554531..ed2e3d7fca 100644 --- a/sys/crypto/aesni/aesni_wrap.c +++ b/sys/dev/crypto/aesni/aesni_wrap.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include MALLOC_DECLARE(M_AESNI); diff --git a/sys/crypto/via/Makefile b/sys/dev/crypto/padlock/Makefile similarity index 100% rename from sys/crypto/via/Makefile rename to sys/dev/crypto/padlock/Makefile diff --git a/sys/crypto/via/padlock.c b/sys/dev/crypto/padlock/padlock.c similarity index 99% rename from sys/crypto/via/padlock.c rename to sys/dev/crypto/padlock/padlock.c index 6c6b2ae8c5..107eeec805 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/dev/crypto/padlock/padlock.c @@ -44,7 +44,7 @@ #include -#include +#include #include #include diff --git a/sys/crypto/via/padlock.h b/sys/dev/crypto/padlock/padlock.h similarity index 100% rename from sys/crypto/via/padlock.h rename to sys/dev/crypto/padlock/padlock.h diff --git a/sys/crypto/via/padlock_cipher.c b/sys/dev/crypto/padlock/padlock_cipher.c similarity index 99% rename from sys/crypto/via/padlock_cipher.c rename to sys/dev/crypto/padlock/padlock_cipher.c index 6ebd75598c..9164526dc5 100644 --- a/sys/crypto/via/padlock_cipher.c +++ b/sys/dev/crypto/padlock/padlock_cipher.c @@ -56,7 +56,7 @@ #include #include -#include +#include #define PADLOCK_ROUND_COUNT_AES128 10 #define PADLOCK_ROUND_COUNT_AES192 12 diff --git a/sys/crypto/via/padlock_hash.c b/sys/dev/crypto/padlock/padlock_hash.c similarity index 99% rename from sys/crypto/via/padlock_hash.c rename to sys/dev/crypto/padlock/padlock_hash.c index b8741da57b..7742d75fdb 100644 --- a/sys/crypto/via/padlock_hash.c +++ b/sys/dev/crypto/padlock/padlock_hash.c @@ -44,7 +44,7 @@ #include /* for hmac_ipad_buffer and hmac_opad_buffer */ #include -#include +#include /* * Implementation notes. diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files index 60c864b34d..68c5d47b3c 100644 --- a/sys/platform/pc32/conf/files +++ b/sys/platform/pc32/conf/files @@ -63,10 +63,6 @@ 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 @@ -103,6 +99,10 @@ acpi_wakecode.h optional acpi \ no-obj no-implicit-rule before-depend \ clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin" # +dev/crypto/aesni/aesencdec_i386.S optional aesni +dev/crypto/aesni/aeskeys_i386.S optional aesni +dev/crypto/aesni/aesni.c optional aesni +dev/crypto/aesni/aesni_wrap.c optional aesni dev/crypto/glxsb/glxsb.c optional glxsb dev/crypto/glxsb/glxsb_hash.c optional glxsb dev/netif/ed/if_ed_isa.c optional ed isa diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files index 54d935fbf0..2460ac2f7a 100644 --- a/sys/platform/pc64/conf/files +++ b/sys/platform/pc64/conf/files @@ -54,10 +54,6 @@ 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 @@ -87,6 +83,10 @@ acpi_wakecode.h optional acpi \ no-obj no-implicit-rule before-depend \ clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin" # +dev/crypto/aesni/aesencdec_x86_64.S optional aesni +dev/crypto/aesni/aeskeys_x86_64.S optional aesni +dev/crypto/aesni/aesni.c optional aesni +dev/crypto/aesni/aesni_wrap.c optional aesni dev/video/fb/fb.c optional vga dev/video/fb/splash.c optional splash dev/video/fb/vga.c optional vga -- 2.41.0