diff options
| author | Pauli <paul.dale@oracle.com> | 2019-09-27 16:35:45 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-27 19:32:55 +1000 |
| commit | 41f7ecf30dc9c1bd6988accc0aa288571a25b7bd (patch) | |
| tree | f3195a68bf04002f25da81d4709cb782720cebf4 /include | |
| parent | e0d952fccf5acddfbd29b1296bf17bec7fc28b86 (diff) | |
Consistent naming for context gettable param queries .
All instances of EVP_*_CTX_gettable_params functions have been renamed
to EVP_*_gettable_ctx_params. Except for the EVP_MD ones which were changed
already.
These functions do not take EVP_*_CTX arguments so their prior naming was
misleading.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10052)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 8 | ||||
| -rw-r--r-- | include/openssl/kdf.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 564106ceff..407162f3f0 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -723,8 +723,8 @@ int EVP_CIPHER_get_params(EVP_CIPHER *cipher, OSSL_PARAM params[]); int EVP_CIPHER_CTX_set_params(EVP_CIPHER_CTX *ctx, const OSSL_PARAM params[]); int EVP_CIPHER_CTX_get_params(EVP_CIPHER_CTX *ctx, OSSL_PARAM params[]); const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher); -const OSSL_PARAM *EVP_CIPHER_CTX_settable_params(const EVP_CIPHER *cipher); -const OSSL_PARAM *EVP_CIPHER_CTX_gettable_params(const EVP_CIPHER *cipher); +const OSSL_PARAM *EVP_CIPHER_settable_ctx_params(const EVP_CIPHER *cipher); +const OSSL_PARAM *EVP_CIPHER_gettable_ctx_params(const EVP_CIPHER *cipher); const BIO_METHOD *BIO_f_md(void); const BIO_METHOD *BIO_f_base64(void); @@ -1060,8 +1060,8 @@ int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen); int EVP_MAC_final(EVP_MAC_CTX *ctx, unsigned char *out, size_t *outl, size_t outsize); const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac); -const OSSL_PARAM *EVP_MAC_CTX_gettable_params(const EVP_MAC *mac); -const OSSL_PARAM *EVP_MAC_CTX_settable_params(const EVP_MAC *mac); +const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac); +const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac); void EVP_MAC_do_all_ex(OPENSSL_CTX *libctx, void (*fn)(EVP_MAC *mac, void *arg), diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index 864a5533ac..2193eaeec0 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -44,8 +44,8 @@ int EVP_KDF_get_params(EVP_KDF *kdf, OSSL_PARAM params[]); int EVP_KDF_CTX_get_params(EVP_KDF_CTX *ctx, OSSL_PARAM params[]); int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]); const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf); -const OSSL_PARAM *EVP_KDF_CTX_gettable_params(const EVP_KDF *kdf); -const OSSL_PARAM *EVP_KDF_CTX_settable_params(const EVP_KDF *kdf); +const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf); +const OSSL_PARAM *EVP_KDF_settable_ctx_params(const EVP_KDF *kdf); void EVP_KDF_do_all_ex(OPENSSL_CTX *libctx, void (*fn)(EVP_KDF *kdf, void *arg), |