summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-10-04 11:50:49 +0100
committerMatt Caswell <matt@openssl.org>2019-11-21 15:45:37 +0000
commitcc35c3ed8ffdc07bb53a2908b8a186fd866ac8d5 (patch)
tree812883483feb00ebe5aa217bdd4ed4a3d90c86b3 /include
parentab5c77b4766e0992751d86560193ca42b49cf316 (diff)
Tweak some algorithm naming inconsistencies
Make some algorithms names better match our "canonical" style. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/10092)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/core_names.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h
index cdc493bae1..1e8b764fb4 100644
--- a/include/openssl/core_names.h
+++ b/include/openssl/core_names.h
@@ -85,8 +85,8 @@ extern "C" {
/* Known DIGEST names (not a complete list) */
#define OSSL_DIGEST_NAME_MD5 "MD5"
-#define OSSL_DIGEST_NAME_KECCAK_KMAC128 "KECCAK_KMAC128"
-#define OSSL_DIGEST_NAME_KECCAK_KMAC256 "KECCAK_KMAC256"
+#define OSSL_DIGEST_NAME_KECCAK_KMAC128 "KECCAK-KMAC-128"
+#define OSSL_DIGEST_NAME_KECCAK_KMAC256 "KECCAK-KMAC-256"
/* MAC parameters */
#define OSSL_MAC_PARAM_KEY "key" /* octet string */
@@ -141,7 +141,7 @@ extern "C" {
/* Known KDF names */
#define OSSL_KDF_NAME_HKDF "HKDF"
#define OSSL_KDF_NAME_PBKDF2 "PBKDF2"
-#define OSSL_KDF_NAME_SCRYPT "id-scrypt"
+#define OSSL_KDF_NAME_SCRYPT "SCRYPT"
#define OSSL_KDF_NAME_SSHKDF "SSHKDF"
#define OSSL_KDF_NAME_SSKDF "SSKDF"
#define OSSL_KDF_NAME_TLS1_PRF "TLS1-PRF"