Rename EVP_KDF_reset() to EVP_KDF_CTX_reset().

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13116)

diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index 10ff88e0533671e01d0f436985c21908c4c38a2d..7a3e9d681cab8ac052126a954be37bf9c2c40863 100644 (file)
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -110,7 +110,7 @@ const EVP_KDF *EVP_KDF_CTX_kdf(EVP_KDF_CTX *ctx)
     return ctx->meth;
 }
 
-void EVP_KDF_reset(EVP_KDF_CTX *ctx)
+void EVP_KDF_CTX_reset(EVP_KDF_CTX *ctx)
 {
     if (ctx == NULL)
         return;

diff --git a/doc/man3/EVP_KDF.pod b/doc/man3/EVP_KDF.pod
index fefb3c6dde47e487321380bac1f8a8dea8ca7e2f..103eafe8c1cefe2517bbc760d04f686ff62f3a2f 100644 (file)
--- a/doc/man3/EVP_KDF.pod
+++ b/doc/man3/EVP_KDF.pod
@@ -93,7 +93,7 @@ I<ctx>.
 
 =head2 Computing functions
 
-EVP_KDF_reset() resets the context to the default state as if the context
+EVP_KDF_CTX_reset() resets the context to the default state as if the context
 had just been created.
 
 EVP_KDF_derive() derives I<keylen> bytes of key material and places it in the
@@ -245,7 +245,7 @@ EVP_KDF_up_ref() returns 1 on success, 0 on error.
 EVP_KDF_CTX_new() returns either the newly allocated
 B<EVP_KDF_CTX> structure or NULL if an error occurred.
 
-EVP_KDF_CTX_free() and EVP_KDF_reset() do not return a value.
+EVP_KDF_CTX_free() and EVP_KDF_CTX_reset() do not return a value.
 
 EVP_KDF_CTX_get_kdf_size() returns the output size.  B<SIZE_MAX> is returned to indicate
 that the algorithm produces a variable amount of output; 0 to indicate failure.

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 0e8d3953c84dfdb61d6ba5f418f24c63ddde499c..3d3edf9356d6447681d6b2c5aaa8216365dd0ba7 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4410,7 +4410,7 @@ EVP_MAC_CTX_new                         ? 3_0_0   EXIST::FUNCTION:
 EVP_MAC_CTX_free                        ?      3_0_0   EXIST::FUNCTION:
 EVP_MAC_CTX_dup                         ?      3_0_0   EXIST::FUNCTION:
 EVP_MAC_CTX_mac                         ?      3_0_0   EXIST::FUNCTION:
-EVP_MAC_size                            ?      3_0_0   EXIST::FUNCTION:
+EVP_MAC_CTX_get_mac_size                ?      3_0_0   EXIST::FUNCTION:
 EVP_MAC_init                            ?      3_0_0   EXIST::FUNCTION:
 EVP_MAC_update                          ?      3_0_0   EXIST::FUNCTION:
 EVP_MAC_final                           ?      3_0_0   EXIST::FUNCTION:
@@ -4438,8 +4438,8 @@ ASYNC_WAIT_CTX_set_status               ? 3_0_0   EXIST::FUNCTION:
 ASYNC_WAIT_CTX_get_status               ?      3_0_0   EXIST::FUNCTION:
 ERR_load_ESS_strings                    ?      3_0_0   EXIST::FUNCTION:
 EVP_KDF_CTX_free                        ?      3_0_0   EXIST::FUNCTION:
-EVP_KDF_reset                           ?      3_0_0   EXIST::FUNCTION:
-EVP_KDF_size                            ?      3_0_0   EXIST::FUNCTION:
+EVP_KDF_CTX_reset                       ?      3_0_0   EXIST::FUNCTION:
+EVP_KDF_CTX_get_kdf_size                ?      3_0_0   EXIST::FUNCTION:
 EVP_KDF_derive                          ?      3_0_0   EXIST::FUNCTION:
 EVP_KDF_name                            ?      3_0_0   EXIST::FUNCTION:
 EC_GROUP_get0_field                     ?      3_0_0   EXIST::FUNCTION:EC