Skip to content

crypto: HCTR2 support

Nathan Huckleberry linux-arm-kernel linux-crypto linux-fscrypt 9 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v9 Latest9 patches 1 replyIn review
  2. v89 patches 2 repliesSuperseded
  3. v79 patches 3 repliesSuperseded
Earlier versions · 6
VersionPostedPatchesRepliesStatus
v69 patches7 repliesSuperseded
v58 patches9 repliesSuperseded
v48 patches19 repliesSuperseded
v38 patches6 repliesSuperseded
v2 RFC7 patches11 repliesSuperseded
v1 RFC7 patches19 repliesSuperseded

Changes in v9 from the cover letter

* Fix redefinition error

Patches in v9 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9crypto: xctr - Add XCTR supportcrypto/Kconfig crypto/Makefile crypto/tcrypt.c +3 more+901 -00 replies
2/9crypto: polyval - Add POLYVAL supportcrypto/Kconfig crypto/Makefile crypto/polyval-generic.c +4 more+412 -00 replies
3/9crypto: hctr2 - Add HCTR2 supportcrypto/Kconfig crypto/Makefile crypto/hctr2.c +3 more+1278 -00 replies
4/9crypto: x86/aesni-xctr: Add accelerated implementation of XCTRarch/x86/crypto/aes_ctrby8_avx-x86_64.S arch/x86/crypto/aesni-intel_glue.c crypto/Kconfig+266 -820 replies
5/9crypto: arm64/aes-xctr: Add accelerated implementation of XCTRarch/arm64/crypto/Kconfig arch/arm64/crypto/aes-glue.c arch/arm64/crypto/aes-modes.S+169 -670 replies
6/9crypto: arm64/aes-xctr: Improve readability of XCTR and CTR modesarch/arm64/crypto/aes-glue.c arch/arm64/crypto/aes-modes.S+185 -680 replies
7/9crypto: x86/polyval: Add PCLMULQDQ accelerated implementation of POLYVALarch/x86/crypto/Makefile arch/x86/crypto/polyval-clmulni_asm.S arch/x86/crypto/polyval-clmulni_glue.c +3 more+581 -00 replies
8/9crypto: arm64/polyval: Add PMULL accelerated implementation of POLYVALarch/arm64/crypto/Kconfig arch/arm64/crypto/Makefile arch/arm64/crypto/polyval-ce-core.S +1 more+560 -00 replies
9/9fscrypt: Add HCTR2 support for filename encryptionDocumentation/filesystems/fscrypt.rst fs/crypto/fscrypt_private.h fs/crypto/keysetup.c +2 more+38 -100 replies

Reviews trailers per patch

All 9 patches have a Reviewed-by or Acked-by.

PatchEric BiggersArd Biesheuvel
1/9R-b R-b
2/9R-b R-b
3/9R-b R-b
4/9R-b R-b
5/9R-b R-b
6/9R-b
7/9R-b R-b
8/9R-b R-b
9/9A-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v9 thread

Cover letter [PATCH v9 0/9] crypto: HCTR2 support

HCTR2 is a length-preserving encryption mode that is efficient on processors with instructions to accelerate AES and carryless multiplication, e.g. x86 processors with AES-NI and CLMUL, and ARM processors with the ARMv8 Crypto Extensions.

HCTR2 is specified in https://ia.cr/2021/1441 "Length-preserving encryption with HCTR2" which shows that if AES is secure and HCTR2 is instantiated with AES, then HCTR2 is secure. Reference code and test vectors are at
https://github.com/google/hctr2.

As a length-preserving encryption mode, HCTR2 is suitable for applications such as storage encryption where ciphertext expansion is not possible, and thus authenticated encryption cannot be used. Currently, such applications usually use XTS, or in some cases Adiantum. XTS has the disadvantage that it is a narrow-block mode: a bitflip will only change 16 bytes in the resulting ciphertext or plaintext. This reveals more information to an attacker than necessary.

HCTR2 is a wide-block mode, so it provides a stronger security property: a bitflip will change the entire message. HCTR2 is somewhat similar to Adiantum, which is also a wide-block mode. However, HCTR2 is designed to take advantage of existing crypto instructions, while Adiantum targets devices without such hardware support. Adiantum is also designed with longer messages in mind, while HCTR2 is designed to be efficient even on short messages.

The first intended use of this mode in the kernel is for the encryption of filenames, where for efficiency reasons encryption must be fully deterministic (only one ciphertext for each plaintext) and the existing CBC solution leaks more information than necessary for filenames with common prefixes.

HCTR2 uses two passes of an ε-almost-∆-universal hash function called POLYVAL and one pass of a block cipher mode called XCTR. POLYVAL is a polynomial hash designed for efficiency on modern processors and was originally specified for use in AES-GCM-SIV (RFC 8452). XCTR mode is a variant of CTR mode that is more efficient on little-endian machines.

This patchset adds HCTR2 to Linux's crypto API, including generic implementations of XCTR and POLYVAL, hardware accelerated implementations of XCTR and POLYVAL for both x86-64 and ARM64, a templated implementation of HCTR2, and an fscrypt policy for using HCTR2 for filename encryption.

Changes in v9:
* Fix redefinition error

Changes in v8:
* Fix incorrect x86 POLYVAL comment
* Add additional comments to ARM64 XCTR/CTR implementation

Changes in v7:
* Added/modified some comments in ARM64 XCTR/CTR implementation
* Various small style fixes

Changes in v6:
* Split ARM64 XCTR/CTR refactoring into separate patch
* Allow simd POLYVAL implementations to be preempted
* Fix uninitialized bug in HCTR2
* Fix streamcipher name handling bug in HCTR2
* Various small style fixes

Changes in v5:
* Refactor HCTR2 tweak hashing
* Remove non-AVX x86-64 XCTR implementation
* Combine arm64 CTR and XCTR modes
* Comment and alias CTR and XCTR modes
* Move generic fallback code for simd POLYVAL into polyval-generic.c
* Various small style fixes

Changes in v4:
* Small style fixes in generic POLYVAL and XCTR
* Move HCTR2 hash exporting/importing to helper functions
* Rewrite montgomery reduction for x86-64 POLYVAL
* Rewrite partial block handling for x86-64 POLYVAL
* Optimize x86-64 POLYVAL loop handling
* Remove ahash wrapper from x86-64 POLYVAL
* Add simd-unavailable handling to x86-64 POLYVAL
* Rewrite montgomery reduction for ARM64 POLYVAL
* Rewrite partial block handling for ARM64 POLYVAL
* Optimize ARM64 POLYVAL loop handling
* Remove ahash wrapper from ARM64 POLYVAL
* Add simd-unavailable handling to ARM64 POLYVAL

Changes in v3:
* Improve testvec coverage for XCTR, POLYVAL and HCTR2
* Fix endianness bug in xctr.c
* Fix alignment issues in polyval-generic.c
* Optimize hctr2.c by exporting/importing hash states
* Fix blockcipher name derivation in hctr2.c
* Move x86-64 XCTR implementation into aes_ctrby8_avx-x86_64.S
* Reuse ARM64 CTR mode tail handling in ARM64 XCTR
* Fix x86-64 POLYVAL comments
* Fix x86-64 POLYVAL key_powers type to match asm
* Fix ARM64 POLYVAL comments
* Fix ARM64 POLYVAL key_powers type to match asm
* Add XTS + HCTR2 policy to fscrypt

Nathan Huckleberry (9):
crypto: xctr - Add XCTR support
crypto: polyval - Add POLYVAL support
crypto: hctr2 - Add HCTR2 support
crypto: x86/aesni-xctr: Add accelerated implementation of XCTR
crypto: arm64/aes-xctr: Add accelerated implementation of XCTR
crypto: arm64/aes-xctr: Improve readability of XCTR and CTR modes
crypto: x86/polyval: Add PCLMULQDQ accelerated implementation of
POLYVAL
crypto: arm64/polyval: Add PMULL accelerated implementation of POLYVAL
fscrypt: Add HCTR2 support for filename encryption

 Documentation/filesystems/fscrypt.rst   |   22 +-
 arch/arm64/crypto/Kconfig               |    9 +-
 arch/arm64/crypto/Makefile              |    3 +
 arch/arm64/crypto/aes-glue.c            |   80 +-
 arch/arm64/crypto/aes-modes.S           |  349 +++--
 arch/arm64/crypto/polyval-ce-core.S     |  361 ++++++
 arch/arm64/crypto/polyval-ce-glue.c     |  191 +++
 arch/x86/crypto/Makefile                |    3 +
 arch/x86/crypto/aes_ctrby8_avx-x86_64.S |  232 ++--
 arch/x86/crypto/aesni-intel_glue.c      |  114 +-
 arch/x86/crypto/polyval-clmulni_asm.S   |  321 +++++
 arch/x86/crypto/polyval-clmulni_glue.c  |  203 +++
 crypto/Kconfig                          |   39 +-
 crypto/Makefile                         |    3 +
 crypto/hctr2.c                          |  581 +++++++++
 crypto/polyval-generic.c                |  245 ++++
 crypto/tcrypt.c                         |   10 +
 crypto/testmgr.c                        |   20 +
 crypto/testmgr.h                        | 1536 +++++++++++++++++++++++
 crypto/xctr.c                           |  191 +++
 fs/crypto/fscrypt_private.h             |    2 +-
 fs/crypto/keysetup.c                    |    7 +
 fs/crypto/policy.c                      |   14 +-
 include/crypto/polyval.h                |   22 +
 include/uapi/linux/fscrypt.h            |    3 +-
 25 files changed, 4362 insertions(+), 199 deletions(-)
 create mode 100644 arch/arm64/crypto/polyval-ce-core.S
 create mode 100644 arch/arm64/crypto/polyval-ce-glue.c
 create mode 100644 arch/x86/crypto/polyval-clmulni_asm.S
 create mode 100644 arch/x86/crypto/polyval-clmulni_glue.c
 create mode 100644 crypto/hctr2.c
 create mode 100644 crypto/polyval-generic.c
 create mode 100644 crypto/xctr.c
 create mode 100644 include/crypto/polyval.h
Signature · 1 line
2.36.1.124.g0e6072fb45-goog