crypto: Kconfig - simplify public-key entries

Shorten menu titles and make them consistent:
- acronym
- name
- architecture features in parenthesis
- no suffixes like "<something> algorithm", "support", or
  "hardware acceleration", or "optimized"

Simplify help text descriptions, update references, and ensure that
https references are still valid.

Signed-off-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index d73d19971b87ac350186b23fb40ce01f96397254..4b062bf53fa2c04e42f1facffba62580505bc555 100644 (file)
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -3,10 +3,15 @@
 menu "Accelerated Cryptographic Algorithms for CPU (arm)"
 
 config CRYPTO_CURVE25519_NEON
-       tristate "NEON accelerated Curve25519 scalar multiplication library"
+       tristate "Public key crypto: Curve25519 (NEON)"
        depends on KERNEL_MODE_NEON
        select CRYPTO_LIB_CURVE25519_GENERIC
        select CRYPTO_ARCH_HAVE_LIB_CURVE25519
+       help
+         Curve25519 algorithm
+
+         Architecture: arm with
+         - NEON (Advanced SIMD) extensions
 
 config CRYPTO_GHASH_ARM_CE
        tristate "PMULL-accelerated GHASH using NEON/ARMv8 Crypto Extensions"

diff --git a/arch/x86/crypto/Kconfig b/arch/x86/crypto/Kconfig
index 04f4baea12a8ea2891ccbd75703fbc46eb435300..76229ccb79fddbb6578ace73eb7051b28cc08a51 100644 (file)
--- a/arch/x86/crypto/Kconfig
+++ b/arch/x86/crypto/Kconfig
@@ -3,10 +3,15 @@
 menu "Accelerated Cryptographic Algorithms for CPU (x86)"
 
 config CRYPTO_CURVE25519_X86
-       tristate "x86_64 accelerated Curve25519 scalar multiplication library"
+       tristate "Public key crypto: Curve25519 (ADX)"
        depends on X86 && 64BIT
        select CRYPTO_LIB_CURVE25519_GENERIC
        select CRYPTO_ARCH_HAVE_LIB_CURVE25519
+       help
+         Curve25519 algorithm
+
+         Architecture: x86_64 using:
+         - ADX (large integer arithmetic)
 
 config CRYPTO_AES_NI_INTEL
        tristate "AES cipher algorithms (AES-NI)"

diff --git a/crypto/Kconfig b/crypto/Kconfig
index e2e364cfa93e9142600645ad0e308142ba6cc533..1fda21abb0d1022673e7fb447ac5821f0ea97bcc 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -240,51 +240,60 @@ endmenu
 menu "Public-key cryptography"
 
 config CRYPTO_RSA
-       tristate "RSA algorithm"
+       tristate "RSA (Rivest-Shamir-Adleman)"
        select CRYPTO_AKCIPHER
        select CRYPTO_MANAGER
        select MPILIB
        select ASN1
        help
-         Generic implementation of the RSA public key algorithm.
+         RSA (Rivest-Shamir-Adleman) public key algorithm (RFC8017)
 
 config CRYPTO_DH
-       tristate "Diffie-Hellman algorithm"
+       tristate "DH (Diffie-Hellman)"
        select CRYPTO_KPP
        select MPILIB
        help
-         Generic implementation of the Diffie-Hellman algorithm.
+         DH (Diffie-Hellman) key exchange algorithm
 
 config CRYPTO_DH_RFC7919_GROUPS
-       bool "Support for RFC 7919 FFDHE group parameters"
+       bool "RFC 7919 FFDHE groups"
        depends on CRYPTO_DH
        select CRYPTO_RNG_DEFAULT
        help
-         Provide support for RFC 7919 FFDHE group parameters. If unsure, say N.
+         FFDHE (Finite-Field-based Diffie-Hellman Ephemeral) groups
+         defined in RFC7919.
+
+         Support these finite-field groups in DH key exchanges:
+         - ffdhe2048, ffdhe3072, ffdhe4096, ffdhe6144, ffdhe8192
+
+         If unsure, say N.
 
 config CRYPTO_ECC
        tristate
        select CRYPTO_RNG_DEFAULT
 
 config CRYPTO_ECDH
-       tristate "ECDH algorithm"
+       tristate "ECDH (Elliptic Curve Diffie-Hellman)"
        select CRYPTO_ECC
        select CRYPTO_KPP
        help
-         Generic implementation of the ECDH algorithm
+         ECDH (Elliptic Curve Diffie-Hellman) key exchange algorithm
+         using curves P-192, P-256, and P-384 (FIPS 186)
 
 config CRYPTO_ECDSA
-       tristate "ECDSA (NIST P192, P256 etc.) algorithm"
+       tristate "ECDSA (Elliptic Curve Digital Signature Algorithm)"
        select CRYPTO_ECC
        select CRYPTO_AKCIPHER
        select ASN1
        help
-         Elliptic Curve Digital Signature Algorithm (NIST P192, P256 etc.)
-         is A NIST cryptographic standard algorithm. Only signature verification
-         is implemented.
+         ECDSA (Elliptic Curve Digital Signature Algorithm) (FIPS 186,
+         ISO/IEC 14888-3)
+         using curves P-192, P-256, and P-384
+
+         Only signature verification is implemented.
 
 config CRYPTO_ECRDSA
-       tristate "EC-RDSA (GOST 34.10) algorithm"
+       tristate "EC-RDSA (Elliptic Curve Russian Digital Signature Algorithm)"
        select CRYPTO_ECC
        select CRYPTO_AKCIPHER
        select CRYPTO_STREEBOG
@@ -292,31 +301,35 @@ config CRYPTO_ECRDSA
        select ASN1
        help
          Elliptic Curve Russian Digital Signature Algorithm (GOST R 34.10-2012,
-         RFC 7091, ISO/IEC 14888-3:2018) is one of the Russian cryptographic
-         standard algorithms (called GOST algorithms). Only signature verification
-         is implemented.
+         RFC 7091, ISO/IEC 14888-3)
+
+         One of the Russian cryptographic standard algorithms (called GOST
+         algorithms). Only signature verification is implemented.
 
 config CRYPTO_SM2
-       tristate "SM2 algorithm"
+       tristate "SM2 (ShangMi 2)"
        select CRYPTO_SM3
        select CRYPTO_AKCIPHER
        select CRYPTO_MANAGER
        select MPILIB
        select ASN1
        help
-         Generic implementation of the SM2 public key algorithm. It was
-         published by State Encryption Management Bureau, China.
+         SM2 (ShangMi 2) public key algorithm
+
+         Published by State Encryption Management Bureau, China,
          as specified by OSCCA GM/T 0003.1-2012 -- 0003.5-2012.
 
          References:
-         https://tools.ietf.org/html/draft-shen-sm2-ecdsa-02
+         https://datatracker.ietf.org/doc/draft-shen-sm2-ecdsa/
          http://www.oscca.gov.cn/sca/xxgk/2010-12/17/content_1002386.shtml
          http://www.gmbz.org.cn/main/bzlb.html
 
 config CRYPTO_CURVE25519
-       tristate "Curve25519 algorithm"
+       tristate "Curve25519"
        select CRYPTO_KPP
        select CRYPTO_LIB_CURVE25519_GENERIC
+       help
+         Curve25519 elliptic curve (RFC7748)
 
 endmenu