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>

diff --git a/arch/x86/crypto/Kconfig b/arch/x86/crypto/Kconfig
index 24875e6295f2d6feec26edd4a1d084e5cc9664ee..7b1bebed879df32ccaf5ae56f90a3da21d335798 100644 (file)
--- a/arch/x86/crypto/Kconfig
+++ b/arch/x86/crypto/Kconfig
@@ -14,7 +14,7 @@ config CRYPTO_CURVE25519_X86
          - ADX (large integer arithmetic)
 
 config CRYPTO_AES_NI_INTEL
-       tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XTR, XTS, GCM (AES-NI)"
+       tristate "Ciphers: AES, modes: ECB, CBC, CTS, CTR, XCTR, XTS, GCM (AES-NI/VAES)"
        depends on X86
        select CRYPTO_AEAD
        select CRYPTO_LIB_AES
@@ -25,10 +25,14 @@ config CRYPTO_AES_NI_INTEL
        help
          Block cipher: AES cipher algorithms
          AEAD cipher: AES with GCM
-         Length-preserving ciphers: AES with ECB, CBC, CTS, CTR, XTR, XTS
+         Length-preserving ciphers: AES with ECB, CBC, CTS, CTR, XCTR, XTS
 
          Architecture: x86 (32-bit and 64-bit) using:
          - AES-NI (AES new instructions)
+         - VAES (Vector AES)
+
+         Some algorithm implementations are supported only in 64-bit builds,
+         and some have additional prerequisites such as AVX2 or AVX512.
 
 config CRYPTO_BLOWFISH_X86_64
        tristate "Ciphers: Blowfish, modes: ECB, CBC"

diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index d63ba9eaba3e44c53ccbcc9ecbdcbd60db07e021..b0dd83555499793211fd1f07c090a0afd02b40d6 100644 (file)
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1750,6 +1750,6 @@ static void __exit aesni_exit(void)
 late_initcall(aesni_init);
 module_exit(aesni_exit);
 
-MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");
+MODULE_DESCRIPTION("AES cipher and modes, optimized with AES-NI or VAES instructions");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CRYPTO("aes");