Skip to content

Finish disentangling ChaCha, Poly1305, and BLAKE2s from CRYPTO

Eric Biggers linux-arch linux-arm-kernel linux-crypto linux-mips linux-riscv linux-s390 linuxppc-dev lkml 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest13 patches 2 repliesIn review
  2. v213 patches 3 repliesSuperseded
  3. v115 patches 12 repliesSuperseded

Changes in v3 from the cover letter

- Fixed build error on arm with CONFIG_CPU_THUMBONLY=y.
- Small whitespace and commit message fixes.
- Added Acked-by's.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13crypto: arm64 - drop redundant dependencies on ARM64arch/arm64/crypto/Kconfig+2 -20 replies
2/13crypto: powerpc - drop redundant dependencies on PPCarch/powerpc/crypto/Kconfig+3 -51 reply
3/13crypto: s390 - drop redundant dependencies on S390arch/s390/crypto/Kconfig+0 -100 replies
4/13crypto: x86 - drop redundant dependencies on X86arch/x86/crypto/Kconfig+33 -340 replies
5/13crypto: arm - move library functions to arch/arm/lib/crypto/MAINTAINERS arch/arm/crypto/Kconfig arch/arm/crypto/Makefile +12 more+62 -360 replies
6/13crypto: arm64 - move library functions to arch/arm64/lib/crypto/arch/arm64/crypto/Kconfig arch/arm64/crypto/Makefile arch/arm64/lib/Makefile +8 more+39 -210 replies
7/13crypto: mips - move library functions to arch/mips/lib/crypto/arch/mips/crypto/Kconfig arch/mips/crypto/Makefile arch/mips/lib/Makefile +8 more+38 -280 replies
8/13crypto: powerpc - move library functions to arch/powerpc/lib/crypto/arch/powerpc/crypto/Kconfig arch/powerpc/crypto/Makefile arch/powerpc/lib/Makefile +7 more+27 -180 replies
9/13crypto: riscv - move library functions to arch/riscv/lib/crypto/arch/riscv/crypto/Kconfig arch/riscv/crypto/Makefile arch/riscv/lib/Makefile +5 more+16 -100 replies
10/13crypto: s390 - move library functions to arch/s390/lib/crypto/arch/s390/crypto/Kconfig arch/s390/crypto/Makefile arch/s390/lib/Makefile +6 more+15 -90 replies
11/13crypto: x86 - move library functions to arch/x86/lib/crypto/arch/x86/crypto/Kconfig arch/x86/crypto/Makefile arch/x86/lib/Makefile +12 more+50 -400 replies
12/13crypto: lib/chacha - remove INTERNAL symbol and selection of CRYPTOarch/arm/lib/crypto/Kconfig arch/arm64/lib/crypto/Kconfig arch/mips/lib/crypto/Kconfig +6 more+13 -190 replies
13/13crypto: lib/poly1305 - remove INTERNAL symbol and selection of CRYPTOarch/arm/lib/crypto/Kconfig arch/arm64/lib/crypto/Kconfig arch/mips/lib/crypto/Kconfig +4 more+11 -170 replies

Reviews trailers per patch

5 of 13 patches have a Reviewed-by or Acked-by.

PatchArd BiesheuvelHeiko CarstensChristophe Leroy
1/13A-b
2/13A-b R-b
3/13A-b A-b
4/13A-b
5/13
6/13
7/13
8/13
9/13
10/13A-b
11/13
12/13
13/13

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/13] Finish disentangling ChaCha, Poly1305, and BLAKE2s from CRYPTO

This series removes the unnecessary dependency of the ChaCha, Poly1305, and BLAKE2s library functions on the generic crypto infrastructure, i.e. CONFIG_CRYPTO. To do this, it moves the architecture-optimized implementations of these functions into new directories arch/*/lib/crypto/ which do not depend on CRYPTO. This mirrors the existing distinction between crypto/ and lib/crypto/.

The last two patches remove the selection of CRYPTO by CRYPTO_LIB_CHACHA and CRYPTO_LIB_POLY1305, and they remove the corresponding *_INTERNAL symbols which were needed only because of the entanglement with CRYPTO.

Note that Curve25519 is still entangled. Later patches will fix that.

Changed in v3:
- Fixed build error on arm with CONFIG_CPU_THUMBONLY=y.
- Small whitespace and commit message fixes.
- Added Acked-by's.

Changed in v2:
- Introduced new directories arch/*/lib/crypto/ instead of keeping the library functions in arch/*/crypto/.

Eric Biggers (13):
crypto: arm64 - drop redundant dependencies on ARM64
crypto: powerpc - drop redundant dependencies on PPC
crypto: s390 - drop redundant dependencies on S390
crypto: x86 - drop redundant dependencies on X86
crypto: arm - move library functions to arch/arm/lib/crypto/
crypto: arm64 - move library functions to arch/arm64/lib/crypto/
crypto: mips - move library functions to arch/mips/lib/crypto/
crypto: powerpc - move library functions to arch/powerpc/lib/crypto/
crypto: riscv - move library functions to arch/riscv/lib/crypto/
crypto: s390 - move library functions to arch/s390/lib/crypto/
crypto: x86 - move library functions to arch/x86/lib/crypto/
crypto: lib/chacha - remove INTERNAL symbol and selection of CRYPTO
crypto: lib/poly1305 - remove INTERNAL symbol and selection of CRYPTO

 MAINTAINERS                                   |  1 +
 arch/arm/crypto/Kconfig                       | 23 -----
 arch/arm/crypto/Makefile                      | 14 +--
 arch/arm/lib/Makefile                         |  2 +
 arch/arm/lib/crypto/.gitignore                |  2 +
 arch/arm/lib/crypto/Kconfig                   | 24 ++++++
 arch/arm/lib/crypto/Makefile                  | 26 ++++++
 arch/arm/{ => lib}/crypto/blake2s-core.S      |  0
 arch/arm/{ => lib}/crypto/blake2s-glue.c      |  0
 arch/arm/{ => lib}/crypto/chacha-glue.c       |  0
 arch/arm/{ => lib}/crypto/chacha-neon-core.S  |  0
 .../arm/{ => lib}/crypto/chacha-scalar-core.S |  0
 arch/arm/{ => lib}/crypto/poly1305-armv4.pl   |  0
 arch/arm/{ => lib}/crypto/poly1305-glue.c     |  0
 arch/arm64/crypto/Kconfig                     | 17 +---
 arch/arm64/crypto/Makefile                    |  9 +-
 arch/arm64/lib/Makefile                       |  3 +
 arch/arm64/lib/crypto/.gitignore              |  2 +
 arch/arm64/lib/crypto/Kconfig                 | 14 +++
 arch/arm64/lib/crypto/Makefile                | 16 ++++
 .../arm64/{ => lib}/crypto/chacha-neon-core.S |  0
 .../arm64/{ => lib}/crypto/chacha-neon-glue.c |  0
 arch/arm64/{ => lib}/crypto/poly1305-armv8.pl |  0
 arch/arm64/{ => lib}/crypto/poly1305-glue.c   |  0
 arch/mips/crypto/Kconfig                      | 11 ---
 arch/mips/crypto/Makefile                     | 17 ----
 arch/mips/lib/Makefile                        |  2 +
 arch/mips/lib/crypto/.gitignore               |  2 +
 arch/mips/lib/crypto/Kconfig                  | 12 +++
 arch/mips/lib/crypto/Makefile                 | 19 ++++
 arch/mips/{ => lib}/crypto/chacha-core.S      |  0
 arch/mips/{ => lib}/crypto/chacha-glue.c      |  0
 arch/mips/{ => lib}/crypto/poly1305-glue.c    |  0
 arch/mips/{ => lib}/crypto/poly1305-mips.pl   |  0
 arch/powerpc/crypto/Kconfig                   | 22 +----
 arch/powerpc/crypto/Makefile                  |  4 -
 arch/powerpc/lib/Makefile                     |  2 +
 arch/powerpc/lib/crypto/Kconfig               | 15 ++++
 arch/powerpc/lib/crypto/Makefile              |  7 ++
 .../{ => lib}/crypto/chacha-p10-glue.c        |  0
 .../{ => lib}/crypto/chacha-p10le-8x.S        |  0
 .../{ => lib}/crypto/poly1305-p10-glue.c      |  0
 .../{ => lib}/crypto/poly1305-p10le_64.S      |  0
 arch/riscv/crypto/Kconfig                     |  7 --
 arch/riscv/crypto/Makefile                    |  3 -
 arch/riscv/lib/Makefile                       |  1 +
 arch/riscv/lib/crypto/Kconfig                 |  8 ++
 arch/riscv/lib/crypto/Makefile                |  4 +
 .../{ => lib}/crypto/chacha-riscv64-glue.c    |  0
 .../{ => lib}/crypto/chacha-riscv64-zvkb.S    |  0
 arch/s390/crypto/Kconfig                      | 16 ----
 arch/s390/crypto/Makefile                     |  3 -
 arch/s390/lib/Makefile                        |  1 +
 arch/s390/lib/crypto/Kconfig                  |  7 ++
 arch/s390/lib/crypto/Makefile                 |  4 +
 arch/s390/{ => lib}/crypto/chacha-glue.c      |  0
 arch/s390/{ => lib}/crypto/chacha-s390.S      |  0
 arch/s390/{ => lib}/crypto/chacha-s390.h      |  0
 arch/x86/crypto/Kconfig                       | 86 +++++++------------
 arch/x86/crypto/Makefile                      | 15 ----
 arch/x86/lib/Makefile                         |  2 +
 arch/x86/lib/crypto/.gitignore                |  2 +
 arch/x86/lib/crypto/Kconfig                   | 26 ++++++
 arch/x86/lib/crypto/Makefile                  | 17 ++++
 arch/x86/{ => lib}/crypto/blake2s-core.S      |  0
 arch/x86/{ => lib}/crypto/blake2s-glue.c      |  0
 .../x86/{ => lib}/crypto/chacha-avx2-x86_64.S |  0
 .../{ => lib}/crypto/chacha-avx512vl-x86_64.S |  0
 .../{ => lib}/crypto/chacha-ssse3-x86_64.S    |  0
 arch/x86/{ => lib}/crypto/chacha_glue.c       |  0
 .../crypto/poly1305-x86_64-cryptogams.pl      |  0
 arch/x86/{ => lib}/crypto/poly1305_glue.c     |  0
 crypto/Kconfig                                |  4 +-
 lib/crypto/Kconfig                            | 56 +++++++-----
 74 files changed, 294 insertions(+), 234 deletions(-)
 create mode 100644 arch/arm/lib/crypto/.gitignore
 create mode 100644 arch/arm/lib/crypto/Kconfig
 create mode 100644 arch/arm/lib/crypto/Makefile
 rename arch/arm/{ => lib}/crypto/blake2s-core.S (100%)
 rename arch/arm/{ => lib}/crypto/blake2s-glue.c (100%)
 rename arch/arm/{ => lib}/crypto/chacha-glue.c (100%)
 rename arch/arm/{ => lib}/crypto/chacha-neon-core.S (100%)
 rename arch/arm/{ => lib}/crypto/chacha-scalar-core.S (100%)
 rename arch/arm/{ => lib}/crypto/poly1305-armv4.pl (100%)
 rename arch/arm/{ => lib}/crypto/poly1305-glue.c (100%)
 create mode 100644 arch/arm64/lib/crypto/.gitignore
 create mode 100644 arch/arm64/lib/crypto/Kconfig
 create mode 100644 arch/arm64/lib/crypto/Makefile
 rename arch/arm64/{ => lib}/crypto/chacha-neon-core.S (100%)
 rename arch/arm64/{ => lib}/crypto/chacha-neon-glue.c (100%)
 rename arch/arm64/{ => lib}/crypto/poly1305-armv8.pl (100%)
 rename arch/arm64/{ => lib}/crypto/poly1305-glue.c (100%)
 create mode 100644 arch/mips/lib/crypto/.gitignore
 create mode 100644 arch/mips/lib/crypto/Kconfig
 create mode 100644 arch/mips/lib/crypto/Makefile
 rename arch/mips/{ => lib}/crypto/chacha-core.S (100%)
 rename arch/mips/{ => lib}/crypto/chacha-glue.c (100%)
 rename arch/mips/{ => lib}/crypto/poly1305-glue.c (100%)
 rename arch/mips/{ => lib}/crypto/poly1305-mips.pl (100%)
 create mode 100644 arch/powerpc/lib/crypto/Kconfig
 create mode 100644 arch/powerpc/lib/crypto/Makefile
 rename arch/powerpc/{ => lib}/crypto/chacha-p10-glue.c (100%)
 rename arch/powerpc/{ => lib}/crypto/chacha-p10le-8x.S (100%)
 rename arch/powerpc/{ => lib}/crypto/poly1305-p10-glue.c (100%)
 rename arch/powerpc/{ => lib}/crypto/poly1305-p10le_64.S (100%)
 create mode 100644 arch/riscv/lib/crypto/Kconfig
 create mode 100644 arch/riscv/lib/crypto/Makefile
 rename arch/riscv/{ => lib}/crypto/chacha-riscv64-glue.c (100%)
 rename arch/riscv/{ => lib}/crypto/chacha-riscv64-zvkb.S (100%)
 create mode 100644 arch/s390/lib/crypto/Kconfig
 create mode 100644 arch/s390/lib/crypto/Makefile
 rename arch/s390/{ => lib}/crypto/chacha-glue.c (100%)
 rename arch/s390/{ => lib}/crypto/chacha-s390.S (100%)
 rename arch/s390/{ => lib}/crypto/chacha-s390.h (100%)
 create mode 100644 arch/x86/lib/crypto/.gitignore
 create mode 100644 arch/x86/lib/crypto/Kconfig
 create mode 100644 arch/x86/lib/crypto/Makefile
 rename arch/x86/{ => lib}/crypto/blake2s-core.S (100%)
 rename arch/x86/{ => lib}/crypto/blake2s-glue.c (100%)
 rename arch/x86/{ => lib}/crypto/chacha-avx2-x86_64.S (100%)
 rename arch/x86/{ => lib}/crypto/chacha-avx512vl-x86_64.S (100%)
 rename arch/x86/{ => lib}/crypto/chacha-ssse3-x86_64.S (100%)
 rename arch/x86/{ => lib}/crypto/chacha_glue.c (100%)
 rename arch/x86/{ => lib}/crypto/poly1305-x86_64-cryptogams.pl (100%)
 rename arch/x86/{ => lib}/crypto/poly1305_glue.c (100%)

base-commit: bb9c648b334be581a791c7669abaa594e4b5ebb7

Signature · 1 line
2.49.0