Skip to content

Commit c299d7a

Browse files
ebiggersherbertx
authored andcommitted
crypto: x86/aesni - update docs for aesni-intel module
Update the kconfig help and module description to reflect that VAES instructions are now used in some cases. Also fix XTR => XCTR. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 78cb66c commit c299d7a

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

arch/x86/crypto/Kconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ config CRYPTO_CURVE25519_X86
1414
- ADX (large integer arithmetic)
1515

1616
config CRYPTO_AES_NI_INTEL
17-
tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XTR, XTS, GCM (AES-NI)"
17+
tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XCTR, XTS, GCM (AES-NI/VAES)"
1818
depends on X86
1919
select CRYPTO_AEAD
2020
select CRYPTO_LIB_AES
@@ -25,10 +25,14 @@ config CRYPTO_AES_NI_INTEL
2525
help
2626
Block cipher: AES cipher algorithms
2727
AEAD cipher: AES with GCM
28-
Length-preserving ciphers: AES with ECB, CBC, CTS, CTR, XTR, XTS
28+
Length-preserving ciphers: AES with ECB, CBC, CTS, CTR, XCTR, XTS
2929

3030
Architecture: x86 (32-bit and 64-bit) using:
3131
- AES-NI (AES new instructions)
32+
- VAES (Vector AES)
33+
34+
Some algorithm implementations are supported only in 64-bit builds,
35+
and some have additional prerequisites such as AVX2 or AVX512.
3236

3337
config CRYPTO_BLOWFISH_X86_64
3438
tristate "Ciphers: Blowfish, modes: ECB, CBC"

arch/x86/crypto/aesni-intel_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1750,6 +1750,6 @@ static void __exit aesni_exit(void)
17501750
late_initcall(aesni_init);
17511751
module_exit(aesni_exit);
17521752

1753-
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");
1753+
MODULE_DESCRIPTION("AES cipher and modes, optimized with AES-NI or VAES instructions");
17541754
MODULE_LICENSE("GPL");
17551755
MODULE_ALIAS_CRYPTO("aes");

0 commit comments

Comments
 (0)