diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-09-14 16:22:19 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-09-19 14:58:17 +0200 |
| commit | f7c16d48a945e80f22f6f02550ee3fe14edb52fa (patch) | |
| tree | b6ec900293f5a14213aa1836c916ea4e11f7c260 /crypto/include/internal | |
| parent | f8c0218f09e190a2efb28302f6c9737efe151d27 (diff) | |
In provider implemented methods, save the name number, not the name string
Multiple names per implementation is already supported in the namemap,
but hasn't been used yet. However, as soon as we have multiple names,
we will get an issue with what name should be saved in the method.
The solution is to not save the name itself, but rather the number
it's associated with. This number is supposed to be unique for each
set of names, and we assume that algorithm names are globally unique,
i.e. there can be no name overlap between different algorithm types.
Incidently, it was also found that the 'get' function used by
ossl_construct_method() doesn't need all the parameters it was given;
most of what it needs, it can now get through the data structure given
by the caller of ossl_construct_method(). As a consequence,
ossl_construct_method() itself doesn't need all the parameters it was
given either.
There are some added internal functions that are expected to disappear
as soon as legacy code is removed, such as evp_first_name() and
ossl_namemap_num2name().
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9897)
Diffstat (limited to 'crypto/include/internal')
| -rw-r--r-- | crypto/include/internal/evp_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index caf0ca1dd9..f1fb67207f 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -130,7 +130,7 @@ extern const EVP_PKEY_METHOD siphash_pkey_meth; struct evp_mac_st { OSSL_PROVIDER *prov; - char *name; + int name_id; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; @@ -152,7 +152,7 @@ struct evp_mac_st { struct evp_kdf_st { OSSL_PROVIDER *prov; - char *name; + int name_id; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; @@ -199,7 +199,7 @@ struct evp_md_st { /* New structure members */ /* TODO(3.0): Remove above comment when legacy has gone */ - char *name; + int name_id; OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; @@ -252,7 +252,7 @@ struct evp_cipher_st { /* New structure members */ /* TODO(3.0): Remove above comment when legacy has gone */ - char *name; + int name_id; OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; |