summaryrefslogtreecommitdiffstats
path: root/crypto/kdf
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2019-04-18 08:26:29 -0400
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-05-03 23:47:43 +0200
commit4679345149f04eece835593823932263d9421456 (patch)
treed51d3e7d53e9d3bfa36c2996c105e1b552a40548 /crypto/kdf
parentff8029c189786196c010292b647f3bca6d51e91d (diff)
Change the digest string from "md" to "digest"
Conform to other modules which were changed at the last minute and this discrepancy was not noticed. Retain "md" as an alias so not to break 3rd party backports/tests scripts. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/8783)
Diffstat (limited to 'crypto/kdf')
-rw-r--r--crypto/kdf/sshkdf.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/kdf/sshkdf.c b/crypto/kdf/sshkdf.c
index 964b033e38..4701c9cad1 100644
--- a/crypto/kdf/sshkdf.c
+++ b/crypto/kdf/sshkdf.c
@@ -125,6 +125,9 @@ static int kdf_sshkdf_ctrl_str(EVP_KDF_IMPL *impl, const char *type,
return 0;
}
+ if (strcmp(type, "digest") == 0)
+ return kdf_md2ctrl(impl, kdf_sshkdf_ctrl, EVP_KDF_CTRL_SET_MD, value);
+ /* alias, for historical reasons */
if (strcmp(type, "md") == 0)
return kdf_md2ctrl(impl, kdf_sshkdf_ctrl, EVP_KDF_CTRL_SET_MD, value);