]> git.ipfire.org Git - thirdparty/openssl.git/commit
Revert "kdf: make function naming consistent."
authorMatt Caswell <matt@openssl.org>
Thu, 18 Jun 2020 08:30:48 +0000 (09:30 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 16 Jul 2020 12:21:07 +0000 (14:21 +0200)
commit660c534435e238c6bd8065c1d544a1c4d3c555a3
treea114a104199c298b21e7670eb169df179f4e3cee
parent865adf97c9b8271788ee7293ecde9e8a643a1c45
Revert "kdf: make function naming consistent."

The commit claimed to make things more consistent. In fact it makes it
less so. Revert back to the previous namig convention.

This reverts commit 765d04c9460a304c8119f57941341a149498b9db.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12186)
26 files changed:
apps/kdf.c
crypto/dh/dh_kdf.c
crypto/ec/ecdh_kdf.c
crypto/evp/kdf_lib.c
crypto/evp/p5_crpt2.c
crypto/evp/pbe_scrypt.c
crypto/evp/pkey_kdf.c
doc/man1/openssl-kdf.pod.in
doc/man3/EVP_KDF.pod
doc/man7/EVP_KDF-HKDF.pod
doc/man7/EVP_KDF-KB.pod
doc/man7/EVP_KDF-KRB5KDF.pod
doc/man7/EVP_KDF-PBKDF2.pod
doc/man7/EVP_KDF-SCRYPT.pod
doc/man7/EVP_KDF-SS.pod
doc/man7/EVP_KDF-SSHKDF.pod
doc/man7/EVP_KDF-TLS1_PRF.pod
doc/man7/EVP_KDF-X942.pod
doc/man7/EVP_KDF-X963.pod
include/openssl/kdf.h
providers/fips/self_test_kats.c
ssl/t1_enc.c
ssl/tls13_enc.c
test/evp_kdf_test.c
test/evp_test.c
util/libcrypto.num