diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-05-14 13:08:42 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-05-24 10:12:18 +1000 |
commit | 7c14d0c1c0ece97f7406b4df466df6439146d6c6 (patch) | |
tree | 0df7120b66ec8b6cc4072492822fa071fd1288ef /include/crypto | |
parent | c45df3302d20291ff1125f1aeb82fae1cdceaac8 (diff) |
Rename the field 'provctx and data' to 'algctx' inside some objects containing
pointers to provider size algorithm contexts.
Fixes #14284
The gettable_ctx_params methods were confusingly passing a 'provctx' and
a provider context which are completely different objects.
Some objects such as EVP_KDF used 'data' while others such as EVP_MD used 'provctx'.
For libcrypto this 'ctx' is an opaque ptr returned when a providers algorithm
implementation creates an internal context using a new_ctx() method.
Hence the new name 'algctx'.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15275)
Diffstat (limited to 'include/crypto')
-rw-r--r-- | include/crypto/evp.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 92a9f0fc29..ea61b83469 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -58,21 +58,37 @@ struct evp_pkey_ctx_st { struct { EVP_KEYEXCH *exchange; - void *exchprovctx; + /* + * Opaque ctx returned from a providers exchange algorithm + * implementation OSSL_FUNC_keyexch_newctx() + */ + void *algctx; } kex; struct { EVP_SIGNATURE *signature; - void *sigprovctx; + /* + * Opaque ctx returned from a providers signature algorithm + * implementation OSSL_FUNC_signature_newctx() + */ + void *algctx; } sig; struct { EVP_ASYM_CIPHER *cipher; - void *ciphprovctx; + /* + * Opaque ctx returned from a providers asymmetric cipher algorithm + * implementation OSSL_FUNC_asym_cipher_newctx() + */ + void *algctx; } ciph; struct { EVP_KEM *kem; - void *kemprovctx; + /* + * Opaque ctx returned from a providers KEM algorithm + * implementation OSSL_FUNC_kem_newctx() + */ + void *algctx; } encap; } op; |