diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-10-13 14:33:01 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-10-22 20:47:02 +1000 |
| commit | a49d0a491c659aacabadc957ab11c738db03a734 (patch) | |
| tree | c62438d5635249383373e6e687b950672adf0059 | |
| parent | 1ba21239ddbd1b18a3676efaa8dd9402e1468818 (diff) | |
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)
| -rw-r--r-- | crypto/evp/kdf_lib.c | 2 | ||||
| -rw-r--r-- | doc/man3/EVP_KDF.pod | 4 | ||||
| -rw-r--r-- | util/libcrypto.num | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index 10ff88e053..7a3e9d681c 100644 --- 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 fefb3c6dde..103eafe8c1 100644 --- 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 0e8d3953c8..3d3edf9356 100644 --- 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 |