Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2808f173 authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Herbert Xu
Browse files

crypto: morus - Mark MORUS SIMD glue as x86-specific 



Commit 56e8e57f ("crypto: morus - Add common SIMD glue code for
MORUS") accidetally consiedered the glue code to be usable by different
architectures, but it seems to be only usable on x86.

This patch moves it under arch/x86/crypto and adds 'depends on X86' to
the Kconfig options and also removes the prompt to hide these internal
options from the user.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarOndrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 92a4c9fe

arch/x86/crypto/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ obj-$(CONFIG_CRYPTO_AEGIS128_AESNI_SSE2) += aegis128-aesni.o 
obj-$(CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2) += aegis128l-aesni.o

obj-$(CONFIG_CRYPTO_AEGIS256_AESNI_SSE2) += aegis256-aesni.o



obj-$(CONFIG_CRYPTO_MORUS640_GLUE) += morus640_glue.o

obj-$(CONFIG_CRYPTO_MORUS1280_GLUE) += morus1280_glue.o



obj-$(CONFIG_CRYPTO_MORUS640_SSE2) += morus640-sse2.o

obj-$(CONFIG_CRYPTO_MORUS1280_SSE2) += morus1280-sse2.o

crypto/morus1280_glue.c→arch/x86/crypto/morus1280_glue.c

+2 −2
Original line number Diff line number Diff line 
/*

 * The MORUS-1280 Authenticated-Encryption Algorithm

 *   Common glue skeleton

 *   Common x86 SIMD glue skeleton

 *

 * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>

 * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
@@ -299,4 +299,4 @@ EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_exit_tfm); 


MODULE_LICENSE("GPL");

MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@gmail.com>");

MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for optimizations");
 
MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for x86 optimizations");

crypto/morus640_glue.c→arch/x86/crypto/morus640_glue.c

+2 −2
Original line number Diff line number Diff line 
/*

 * The MORUS-640 Authenticated-Encryption Algorithm

 *   Common glue skeleton

 *   Common x86 SIMD glue skeleton

 *

 * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>

 * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
@@ -295,4 +295,4 @@ EXPORT_SYMBOL_GPL(cryptd_morus640_glue_exit_tfm); 


MODULE_LICENSE("GPL");

MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@gmail.com>");

MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for optimizations");
 
MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for x86 optimizations");

crypto/Kconfig

+4 −2
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ config CRYPTO_MORUS640 
	  Support for the MORUS-640 dedicated AEAD algorithm.



config CRYPTO_MORUS640_GLUE

	tristate "MORUS-640 AEAD algorithm (glue for SIMD optimizations)"

	tristate

	depends on X86

	select CRYPTO_AEAD

	select CRYPTO_CRYPTD

	help
@@ -363,7 +364,8 @@ config CRYPTO_MORUS1280 
	  Support for the MORUS-1280 dedicated AEAD algorithm.



config CRYPTO_MORUS1280_GLUE

	tristate "MORUS-1280 AEAD algorithm (glue for SIMD optimizations)"

	tristate

	depends on X86

	select CRYPTO_AEAD

	select CRYPTO_CRYPTD

	help

crypto/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ obj-$(CONFIG_CRYPTO_AEGIS128L) += aegis128l.o 
obj-$(CONFIG_CRYPTO_AEGIS256) += aegis256.o

obj-$(CONFIG_CRYPTO_MORUS640) += morus640.o

obj-$(CONFIG_CRYPTO_MORUS1280) += morus1280.o

obj-$(CONFIG_CRYPTO_MORUS640_GLUE) += morus640_glue.o

obj-$(CONFIG_CRYPTO_MORUS1280_GLUE) += morus1280_glue.o

obj-$(CONFIG_CRYPTO_PCRYPT) += pcrypt.o

obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o

obj-$(CONFIG_CRYPTO_MCRYPTD) += mcryptd.o