From 2607bca6664e38f130ea239a289deb1e75a7db38 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 25 Oct 2018 22:21:03 +0200 Subject: [PATCH] Give "DH" and "DHM" as alternative names Be consistent about calling it just "Diffie-Hellman", except once where I state that "Diffie-Hellman-Merkle" is an alternative name. --- include/psa/crypto.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/psa/crypto.h b/include/psa/crypto.h index 8fb641fdc..1ec9627eb 100644 --- a/include/psa/crypto.h +++ b/include/psa/crypto.h @@ -1222,8 +1222,9 @@ typedef uint32_t psa_algorithm_t; #define PSA_ALG_FFDH_BASE ((psa_algorithm_t)0x22100000) /** The Diffie-Hellman key agreement algorithm. * - * This algorithm combines the finite-field Diffie-Hellman-Merkle key - * agreement to produce a shared secret from a private key and the peer's + * This algorithm combines the finite-field Diffie-Hellman (DH) key + * agreement, also known as Diffie-Hellman-Merkle (DHM) key agreement, + * to produce a shared secret from a private key and the peer's * public key, with a key selection or key derivation algorithm to produce * one or more shared keys and other shared cryptographic material. * @@ -1252,7 +1253,7 @@ typedef uint32_t psa_algorithm_t; (PSA_ALG_KEY_AGREEMENT_GET_BASE(alg) == PSA_ALG_FFDH_BASE) #define PSA_ALG_ECDH_BASE ((psa_algorithm_t)0x22200000) -/** The elliptic curve Diffie-Hellman key agreement algorithm. +/** The elliptic curve Diffie-Hellman (ECDH) key agreement algorithm. * * This algorithm combines the elliptic curve Diffie-Hellman key * agreement to produce a shared secret from a private key and the peer's