diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-02-03 05:42:48 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-02-07 09:37:56 +0100 |
| commit | 68552cdef7631191e77315e0faeb42c6893cafe3 (patch) | |
| tree | b289807007316a0b0a8dfba53acc5f6fa8dbcc4e /include/crypto/evp.h | |
| parent | bd2ff9e8674b34a7547a7fa75b81b6b36f60dbb8 (diff) | |
Reorganize the internal evp_keymgmt functions
Some of the evp_keymgmt_ functions are just wrappers around the
EVP_KEYMGMT function pointers. We move those from keymgmt_lib.c to
keymgmt_meth.c.
Other evp_keymgmt_ functions are utility functions to help the rest of
the EVP functions. Since their names are easily confused with the
functions that were moved to keymgmt_meth.c, we rename them so they
all start with evp_keymgmt_util_.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11006)
Diffstat (limited to 'include/crypto/evp.h')
| -rw-r--r-- | include/crypto/evp.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 5d6f70be78..cafb465ed9 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -593,17 +593,22 @@ void openssl_add_all_digests_int(void); void evp_cleanup_int(void); void evp_app_cleanup_int(void); -/* KEYMGMT helper functions */ -void *evp_keymgmt_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt, - int domainparams); -void evp_keymgmt_clear_pkey_cache(EVP_PKEY *pk); -void evp_keymgmt_cache_pkey(EVP_PKEY *pk, size_t index, EVP_KEYMGMT *keymgmt, - void *provdata, int domainparams); -void *evp_keymgmt_fromdata(EVP_PKEY *target, EVP_KEYMGMT *keymgmt, - const OSSL_PARAM params[], int domainparams); +/* + * KEYMGMT utility functions + */ +void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt, + int domainparams); +void evp_keymgmt_util_clear_pkey_cache(EVP_PKEY *pk); +void evp_keymgmt_util_cache_pkey(EVP_PKEY *pk, size_t index, + EVP_KEYMGMT *keymgmt, void *provdata, + int domainparams); +void *evp_keymgmt_util_fromdata(EVP_PKEY *target, EVP_KEYMGMT *keymgmt, + const OSSL_PARAM params[], int domainparams); -/* KEYMGMT provider interface functions */ +/* + * KEYMGMT provider interface functions + */ void *evp_keymgmt_importdomparams(const EVP_KEYMGMT *keymgmt, const OSSL_PARAM params[]); void *evp_keymgmt_gendomparams(const EVP_KEYMGMT *keymgmt, |