mirror of
https://github.com/torvalds/linux.git
synced 2026-01-12 00:42:35 +08:00
crypto: lib/poly1305 - remove INTERNAL symbol and selection of CRYPTO
Now that the architecture-optimized Poly1305 kconfig symbols are defined regardless of CRYPTO, there is no need for CRYPTO_LIB_POLY1305 to select CRYPTO. So, remove that. This makes the indirection through the CRYPTO_LIB_POLY1305_INTERNAL symbol unnecessary, so get rid of that and just use CRYPTO_LIB_POLY1305 directly. Finally, make the fallback to the generic implementation use a default value instead of a select; this makes it consistent with how the arch-optimized code gets enabled and also with how CRYPTO_LIB_BLAKE2S_GENERIC gets enabled. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
@@ -20,5 +20,5 @@ config CRYPTO_CHACHA20_NEON
|
||||
|
||||
config CRYPTO_POLY1305_ARM
|
||||
tristate
|
||||
default CRYPTO_LIB_POLY1305_INTERNAL
|
||||
default CRYPTO_LIB_POLY1305
|
||||
select CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
|
||||
@@ -10,5 +10,5 @@ config CRYPTO_CHACHA20_NEON
|
||||
config CRYPTO_POLY1305_NEON
|
||||
tristate
|
||||
depends on KERNEL_MODE_NEON
|
||||
default CRYPTO_LIB_POLY1305_INTERNAL
|
||||
default CRYPTO_LIB_POLY1305
|
||||
select CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
|
||||
@@ -8,5 +8,5 @@ config CRYPTO_CHACHA_MIPS
|
||||
|
||||
config CRYPTO_POLY1305_MIPS
|
||||
tristate
|
||||
default CRYPTO_LIB_POLY1305_INTERNAL
|
||||
default CRYPTO_LIB_POLY1305
|
||||
select CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
|
||||
@@ -10,6 +10,6 @@ config CRYPTO_CHACHA20_P10
|
||||
config CRYPTO_POLY1305_P10
|
||||
tristate
|
||||
depends on PPC64 && CPU_LITTLE_ENDIAN && VSX
|
||||
default CRYPTO_LIB_POLY1305_INTERNAL
|
||||
default CRYPTO_LIB_POLY1305
|
||||
select CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
select CRYPTO_LIB_POLY1305_GENERIC
|
||||
|
||||
@@ -22,5 +22,5 @@ config CRYPTO_CHACHA20_X86_64
|
||||
config CRYPTO_POLY1305_X86_64
|
||||
tristate
|
||||
depends on 64BIT
|
||||
default CRYPTO_LIB_POLY1305_INTERNAL
|
||||
default CRYPTO_LIB_POLY1305
|
||||
select CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
|
||||
@@ -956,8 +956,8 @@ config CRYPTO_POLYVAL
|
||||
config CRYPTO_POLY1305
|
||||
tristate "Poly1305"
|
||||
select CRYPTO_HASH
|
||||
select CRYPTO_LIB_POLY1305
|
||||
select CRYPTO_LIB_POLY1305_GENERIC
|
||||
select CRYPTO_LIB_POLY1305_INTERNAL
|
||||
help
|
||||
Poly1305 authenticator algorithm (RFC7539)
|
||||
|
||||
|
||||
@@ -114,21 +114,15 @@ config CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
|
||||
config CRYPTO_LIB_POLY1305_GENERIC
|
||||
tristate
|
||||
default CRYPTO_LIB_POLY1305 if !CRYPTO_ARCH_HAVE_LIB_POLY1305
|
||||
help
|
||||
This symbol can be depended upon by arch implementations of the
|
||||
Poly1305 library interface that require the generic code as a
|
||||
fallback, e.g., for SIMD implementations. If no arch specific
|
||||
implementation is enabled, this implementation serves the users
|
||||
of CRYPTO_LIB_POLY1305.
|
||||
|
||||
config CRYPTO_LIB_POLY1305_INTERNAL
|
||||
tristate
|
||||
select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n
|
||||
This symbol can be selected by arch implementations of the Poly1305
|
||||
library interface that require the generic code as a fallback, e.g.,
|
||||
for SIMD implementations. If no arch specific implementation is
|
||||
enabled, this implementation serves the users of CRYPTO_LIB_POLY1305.
|
||||
|
||||
config CRYPTO_LIB_POLY1305
|
||||
tristate
|
||||
select CRYPTO
|
||||
select CRYPTO_LIB_POLY1305_INTERNAL
|
||||
help
|
||||
Enable the Poly1305 library interface. This interface may be fulfilled
|
||||
by either the generic implementation or an arch-specific one, if one
|
||||
|
||||
Reference in New Issue
Block a user