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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/fipsinstall.c | 2 | ||||
| -rw-r--r-- | apps/kdf.c | 2 | ||||
| -rw-r--r-- | apps/list.c | 12 | ||||
| -rw-r--r-- | apps/mac.c | 2 | ||||
| -rw-r--r-- | apps/provider.c | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c index 78200c5876..fd28b484b9 100644 --- a/apps/fipsinstall.c +++ b/apps/fipsinstall.c @@ -341,7 +341,7 @@ opthelp: if (opts != NULL) { int ok = 1; OSSL_PARAM *params = - app_params_new_from_opts(opts, EVP_MAC_CTX_settable_params(mac)); + app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac)); if (params == NULL) goto end; diff --git a/apps/kdf.c b/apps/kdf.c index c230430697..35cc0db21c 100644 --- a/apps/kdf.c +++ b/apps/kdf.c @@ -96,7 +96,7 @@ opthelp: if (opts != NULL) { int ok = 1; OSSL_PARAM *params = - app_params_new_from_opts(opts, EVP_KDF_CTX_settable_params(kdf)); + app_params_new_from_opts(opts, EVP_KDF_settable_ctx_params(kdf)); if (params == NULL) goto err; diff --git a/apps/list.c b/apps/list.c index 5348cc68dd..d7c46906aa 100644 --- a/apps/list.c +++ b/apps/list.c @@ -76,9 +76,9 @@ static void list_ciphers(void) print_param_types("retrievable algorithm parameters", EVP_CIPHER_gettable_params(c), 4); print_param_types("retrievable operation parameters", - EVP_CIPHER_CTX_gettable_params(c), 4); + EVP_CIPHER_gettable_ctx_params(c), 4); print_param_types("settable operation parameters", - EVP_CIPHER_CTX_settable_params(c), 4); + EVP_CIPHER_settable_ctx_params(c), 4); } } sk_EVP_CIPHER_pop_free(ciphers, EVP_CIPHER_free); @@ -186,9 +186,9 @@ static void list_macs(void) print_param_types("retrievable algorithm parameters", EVP_MAC_gettable_params(m), 4); print_param_types("retrievable operation parameters", - EVP_MAC_CTX_gettable_params(m), 4); + EVP_MAC_gettable_ctx_params(m), 4); print_param_types("settable operation parameters", - EVP_MAC_CTX_settable_params(m), 4); + EVP_MAC_settable_ctx_params(m), 4); } } sk_EVP_MAC_pop_free(macs, EVP_MAC_free); @@ -236,9 +236,9 @@ static void list_kdfs(void) print_param_types("retrievable algorithm parameters", EVP_KDF_gettable_params(m), 4); print_param_types("retrievable operation parameters", - EVP_KDF_CTX_gettable_params(m), 4); + EVP_KDF_gettable_ctx_params(m), 4); print_param_types("settable operation parameters", - EVP_KDF_CTX_settable_params(m), 4); + EVP_KDF_settable_ctx_params(m), 4); } } sk_EVP_KDF_pop_free(kdfs, EVP_KDF_free); diff --git a/apps/mac.c b/apps/mac.c index 205d82f779..8383d0d7b3 100644 --- a/apps/mac.c +++ b/apps/mac.c @@ -105,7 +105,7 @@ opthelp: if (opts != NULL) { int ok = 1; OSSL_PARAM *params = - app_params_new_from_opts(opts, EVP_MAC_CTX_settable_params(mac)); + app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac)); if (params == NULL) goto err; diff --git a/apps/provider.c b/apps/provider.c index 29afdcef48..ab91e68f43 100644 --- a/apps/provider.c +++ b/apps/provider.c @@ -108,8 +108,8 @@ static void do_cipher(EVP_CIPHER *cipher, void *meta) { do_method(cipher, EVP_CIPHER_name(cipher), EVP_CIPHER_gettable_params(cipher), - EVP_CIPHER_CTX_gettable_params(cipher), - EVP_CIPHER_CTX_settable_params(cipher), + EVP_CIPHER_gettable_ctx_params(cipher), + EVP_CIPHER_settable_ctx_params(cipher), meta); } @@ -126,8 +126,8 @@ static void do_mac(EVP_MAC *mac, void *meta) { do_method(mac, EVP_MAC_name(mac), EVP_MAC_gettable_params(mac), - EVP_MAC_CTX_gettable_params(mac), - EVP_MAC_CTX_settable_params(mac), + EVP_MAC_gettable_ctx_params(mac), + EVP_MAC_settable_ctx_params(mac), meta); } |