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 /crypto | |
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 'crypto')
-rw-r--r-- | crypto/evp/evp_enc.c | 4 | ||||
-rw-r--r-- | crypto/evp/kdf_meth.c | 4 | ||||
-rw-r--r-- | crypto/evp/mac_meth.c | 4 | ||||
-rw-r--r-- | crypto/evp/pkey_kdf.c | 2 | ||||
-rw-r--r-- | crypto/evp/pkey_mac.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index a3fb5f7424..09c49b6202 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -1181,14 +1181,14 @@ const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher) return NULL; } -const OSSL_PARAM *EVP_CIPHER_CTX_settable_params(const EVP_CIPHER *cipher) +const OSSL_PARAM *EVP_CIPHER_settable_ctx_params(const EVP_CIPHER *cipher) { if (cipher != NULL && cipher->settable_ctx_params != NULL) return cipher->settable_ctx_params(); return NULL; } -const OSSL_PARAM *EVP_CIPHER_CTX_gettable_params(const EVP_CIPHER *cipher) +const OSSL_PARAM *EVP_CIPHER_gettable_ctx_params(const EVP_CIPHER *cipher) { if (cipher != NULL && cipher->gettable_ctx_params != NULL) return cipher->gettable_ctx_params(); diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c index 3a2d028153..e6185e9255 100644 --- a/crypto/evp/kdf_meth.c +++ b/crypto/evp/kdf_meth.c @@ -173,14 +173,14 @@ const OSSL_PARAM *EVP_KDF_gettable_params(const EVP_KDF *kdf) return kdf->gettable_params(); } -const OSSL_PARAM *EVP_KDF_CTX_gettable_params(const EVP_KDF *kdf) +const OSSL_PARAM *EVP_KDF_gettable_ctx_params(const EVP_KDF *kdf) { if (kdf->gettable_ctx_params == NULL) return NULL; return kdf->gettable_ctx_params(); } -const OSSL_PARAM *EVP_KDF_CTX_settable_params(const EVP_KDF *kdf) +const OSSL_PARAM *EVP_KDF_settable_ctx_params(const EVP_KDF *kdf) { if (kdf->settable_ctx_params == NULL) return NULL; diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index c01f04ef76..f35c2d157e 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -190,14 +190,14 @@ const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac) return mac->gettable_params(); } -const OSSL_PARAM *EVP_MAC_CTX_gettable_params(const EVP_MAC *mac) +const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac) { if (mac->gettable_ctx_params == NULL) return NULL; return mac->gettable_ctx_params(); } -const OSSL_PARAM *EVP_MAC_CTX_settable_params(const EVP_MAC *mac) +const OSSL_PARAM *EVP_MAC_settable_ctx_params(const EVP_MAC *mac) { if (mac->settable_ctx_params == NULL) return NULL; diff --git a/crypto/evp/pkey_kdf.c b/crypto/evp/pkey_kdf.c index d57ff6fd47..b1337f511a 100644 --- a/crypto/evp/pkey_kdf.c +++ b/crypto/evp/pkey_kdf.c @@ -213,7 +213,7 @@ static int pkey_kdf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, EVP_KDF_CTX *kctx = pkctx->kctx; const EVP_KDF *kdf = EVP_KDF_CTX_kdf(kctx); BUF_MEM **collector = NULL; - const OSSL_PARAM *defs = EVP_KDF_CTX_settable_params(kdf); + const OSSL_PARAM *defs = EVP_KDF_settable_ctx_params(kdf); OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END }; int ok = 0; diff --git a/crypto/evp/pkey_mac.c b/crypto/evp/pkey_mac.c index 005741dd15..1c8f878512 100644 --- a/crypto/evp/pkey_mac.c +++ b/crypto/evp/pkey_mac.c @@ -452,7 +452,7 @@ static int pkey_mac_ctrl_str(EVP_PKEY_CTX *ctx, type = OSSL_MAC_PARAM_SIZE; if (!OSSL_PARAM_allocate_from_text(¶ms[0], - EVP_MAC_CTX_settable_params(mac), + EVP_MAC_settable_ctx_params(mac), type, value, strlen(value) + 1)) return 0; params[1] = OSSL_PARAM_construct_end(); |