diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/evp/digest.c | 2 | ||||
-rw-r--r-- | crypto/evp/evp_enc.c | 2 | ||||
-rw-r--r-- | crypto/evp/evp_fetch.c | 6 | ||||
-rw-r--r-- | crypto/evp/evp_lib.c | 16 | ||||
-rw-r--r-- | crypto/evp/evp_local.h | 6 | ||||
-rw-r--r-- | crypto/evp/exchange.c | 8 | ||||
-rw-r--r-- | crypto/evp/kdf_lib.c | 13 | ||||
-rw-r--r-- | crypto/evp/keymgmt_meth.c | 8 | ||||
-rw-r--r-- | crypto/evp/mac_lib.c | 8 | ||||
-rw-r--r-- | crypto/evp/mac_meth.c | 5 | ||||
-rw-r--r-- | crypto/evp/pmeth_fn.c | 9 |
11 files changed, 65 insertions, 18 deletions
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index a8e8326..11c334c 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -760,7 +760,7 @@ static void *evp_md_from_dispatch(int name_id, #ifndef FIPS_MODE /* TODO(3.x) get rid of the need for legacy NIDs */ md->type = NID_undef; - evp_doall_names(prov, name_id, set_legacy_nid, &md->type); + evp_names_do_all(prov, name_id, set_legacy_nid, &md->type); if (md->type == -1) { ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR); EVP_MD_free(md); diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 4406b7f..efcb7e5 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -1365,7 +1365,7 @@ static void *evp_cipher_from_dispatch(const int name_id, #ifndef FIPS_MODE /* TODO(3.x) get rid of the need for legacy NIDs */ cipher->nid = NID_undef; - evp_doall_names(prov, name_id, set_legacy_nid, &cipher->nid); + evp_names_do_all(prov, name_id, set_legacy_nid, &cipher->nid); if (cipher->nid == -1) { ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR); EVP_CIPHER_free(cipher); diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index 2404dfc..e2039df 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -468,9 +468,9 @@ int evp_is_a(OSSL_PROVIDER *prov, int number, const char *name) return ossl_namemap_name2num(namemap, name) == number; } -void evp_doall_names(OSSL_PROVIDER *prov, int number, - void (*fn)(const char *name, void *data), - void *data) +void evp_names_do_all(OSSL_PROVIDER *prov, int number, + void (*fn)(const char *name, void *data), + void *data) { OPENSSL_CTX *libctx = ossl_provider_library_context(prov); OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx); diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index f87793d..f5e2505 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -556,6 +556,14 @@ const char *EVP_CIPHER_name(const EVP_CIPHER *cipher) #endif } +void EVP_CIPHER_names_do_all(const EVP_CIPHER *cipher, + void (*fn)(const char *name, void *data), + void *data) +{ + if (cipher->prov != NULL) + evp_names_do_all(cipher->prov, cipher->name_id, fn, data); +} + const OSSL_PROVIDER *EVP_CIPHER_provider(const EVP_CIPHER *cipher) { return cipher->prov; @@ -589,6 +597,14 @@ const char *EVP_MD_name(const EVP_MD *md) #endif } +void EVP_MD_names_do_all(const EVP_MD *md, + void (*fn)(const char *name, void *data), + void *data) +{ + if (md->prov != NULL) + evp_names_do_all(md->prov, md->name_id, fn, data); +} + const OSSL_PROVIDER *EVP_MD_provider(const EVP_MD *md) { return md->prov; diff --git a/crypto/evp/evp_local.h b/crypto/evp/evp_local.h index b14d27c..9b20819 100644 --- a/crypto/evp/evp_local.h +++ b/crypto/evp/evp_local.h @@ -261,6 +261,6 @@ void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx); /* OSSL_PROVIDER * is only used to get the library context */ const char *evp_first_name(OSSL_PROVIDER *prov, int name_id); int evp_is_a(OSSL_PROVIDER *prov, int number, const char *name); -void evp_doall_names(OSSL_PROVIDER *prov, int number, - void (*fn)(const char *name, void *data), - void *data); +void evp_names_do_all(OSSL_PROVIDER *prov, int number, + void (*fn)(const char *name, void *data), + void *data); diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c index 437d6a5..e9d7c6d 100644 --- a/crypto/evp/exchange.c +++ b/crypto/evp/exchange.c @@ -405,3 +405,11 @@ void EVP_KEYEXCH_do_all_provided(OPENSSL_CTX *libctx, evp_keyexch_from_dispatch, &keymgmt_data, (void (*)(void *))EVP_KEYEXCH_free); } + +void EVP_KEYEXCH_names_do_all(const EVP_KEYEXCH *keyexch, + void (*fn)(const char *name, void *data), + void *data) +{ + if (keyexch->prov != NULL) + evp_names_do_all(keyexch->prov, keyexch->name_id, fn, data); +} diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c index b85f0e0..90c43e9 100644 --- a/crypto/evp/kdf_lib.c +++ b/crypto/evp/kdf_lib.c @@ -83,11 +83,6 @@ EVP_KDF_CTX *EVP_KDF_CTX_dup(const EVP_KDF_CTX *src) return dst; } -const char *EVP_KDF_name(const EVP_KDF *kdf) -{ - return evp_first_name(kdf->prov, kdf->name_id); -} - int EVP_KDF_is_a(const EVP_KDF *kdf, const char *name) { return evp_is_a(kdf->prov, kdf->name_id, name); @@ -164,3 +159,11 @@ int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]) return ctx->meth->set_ctx_params(ctx->data, params); return 1; } + +void EVP_KDF_names_do_all(const EVP_KDF *kdf, + void (*fn)(const char *name, void *data), + void *data) +{ + if (kdf->prov != NULL) + evp_names_do_all(kdf->prov, kdf->name_id, fn, data); +} diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index 990f899..6a1c15a 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -214,3 +214,11 @@ void EVP_KEYMGMT_do_all_provided(OPENSSL_CTX *libctx, keymgmt_from_dispatch, NULL, (void (*)(void *))EVP_KEYMGMT_free); } + +void EVP_KEYMGMT_names_do_all(const EVP_KEYMGMT *keymgmt, + void (*fn)(const char *name, void *data), + void *data) +{ + if (keymgmt->prov != NULL) + evp_names_do_all(keymgmt->prov, keymgmt->name_id, fn, data); +} diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c index b6df6a5..8581853 100644 --- a/crypto/evp/mac_lib.c +++ b/crypto/evp/mac_lib.c @@ -162,3 +162,11 @@ int EVP_MAC_is_a(const EVP_MAC *mac, const char *name) { return evp_is_a(mac->prov, mac->name_id, name); } + +void EVP_MAC_names_do_all(const EVP_MAC *mac, + void (*fn)(const char *name, void *data), + void *data) +{ + if (mac->prov != NULL) + evp_names_do_all(mac->prov, mac->name_id, fn, data); +} diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index 86f5434..2c124ae 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -168,11 +168,6 @@ void EVP_MAC_free(EVP_MAC *mac) evp_mac_free(mac); } -const char *EVP_MAC_name(const EVP_MAC *mac) -{ - return evp_first_name(mac->prov, mac->name_id); -} - const OSSL_PROVIDER *EVP_MAC_provider(const EVP_MAC *mac) { return mac->prov; diff --git a/crypto/evp/pmeth_fn.c b/crypto/evp/pmeth_fn.c index 2b4bca5..685b688 100644 --- a/crypto/evp/pmeth_fn.c +++ b/crypto/evp/pmeth_fn.c @@ -332,6 +332,15 @@ void EVP_SIGNATURE_do_all_provided(OPENSSL_CTX *libctx, (void (*)(void *))EVP_SIGNATURE_free); } + +void EVP_SIGNATURE_names_do_all(const EVP_SIGNATURE *signature, + void (*fn)(const char *name, void *data), + void *data) +{ + if (signature->prov != NULL) + evp_names_do_all(signature->prov, signature->name_id, fn, data); +} + static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature, int operation) { |