Skip to content

Commit

Permalink
Revert "crypto: poly1305 - cleanup stray CRYPTO_LIB_POLY1305_RSIZE"
Browse files Browse the repository at this point in the history
This reverts commit 8bdc2a1.

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: Sudip Mukherjee <[email protected]>
Reported-by: kernel test robot <[email protected]>
Fixes: 8bdc2a1 ("crypto: poly1305 - cleanup stray CRYPTO_LIB_POLY1305_RSIZE")
Signed-off-by: Jason A. Donenfeld <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
zx2c4 authored and torvalds committed May 28, 2022
1 parent 9d004b2 commit ca7984d
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion lib/crypto/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ config CRYPTO_LIB_POLY1305_RSIZE
default 11 if X86_64
default 9 if ARM || ARM64
default 1
depends on CRYPTO_LIB_POLY1305

config CRYPTO_ARCH_HAVE_LIB_POLY1305
tristate
Expand Down

0 comments on commit ca7984d

Please sign in to comment.