Commit ca7984df authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Linus Torvalds

Revert "crypto: poly1305 - cleanup stray CRYPTO_LIB_POLY1305_RSIZE"

This reverts commit 8bdc2a19.

It got merged a bit prematurely and shortly after the kernel test robot
and Sudip pointed out build failures:

  arm: imx_v6_v7_defconfig and multi_v7_defconfig
  mips: decstation_64_defconfig, decstation_defconfig, decstation_r4k_defconfig

  In file included from crypto/chacha20poly1305.c:13:
  include/crypto/poly1305.h:56:46: error: 'CONFIG_CRYPTO_LIB_POLY1305_RSIZE' undeclared here (not in a function); did you mean 'CONFIG_CRYPTO_POLY1305_MODULE'?
     56 |                 struct poly1305_key opaque_r[CONFIG_CRYPTO_LIB_POLY1305_RSIZE];
        |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

We could attempt to fix this by listing the dependencies piecemeal, but
it's not as obvious as it looks: drivers like caam use this macro in
headers even if there's no .o compiled in that makes use of it.  So
actually fixing this might require a bit more of a comprehensive
approach, rather than whack-a-mole with hunting down which drivers use
which headers which use this macro.

Therefore, this commit just reverts the change, and maybe the problem
can be visited on the next rainy day.
Reported-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: 8bdc2a19 ("crypto: poly1305 - cleanup stray CRYPTO_LIB_POLY1305_RSIZE")
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9d004b2f
...@@ -85,7 +85,6 @@ config CRYPTO_LIB_POLY1305_RSIZE ...@@ -85,7 +85,6 @@ config CRYPTO_LIB_POLY1305_RSIZE
default 11 if X86_64 default 11 if X86_64
default 9 if ARM || ARM64 default 9 if ARM || ARM64
default 1 default 1
depends on CRYPTO_LIB_POLY1305
config CRYPTO_ARCH_HAVE_LIB_POLY1305 config CRYPTO_ARCH_HAVE_LIB_POLY1305
tristate tristate
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment