diff options
| author | slontis <shane.lontis@oracle.com> | 2023-06-16 16:40:06 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-08-16 18:02:51 +0200 |
| commit | 39ed7636e0d8a90512e7ccb811cd0bfcb7a79650 (patch) | |
| tree | da7067bfcf6d7f78574185a3152db9581a6aaa3c /include/crypto | |
| parent | a25715be77ff43cd816a2011fff50b68204e9c0e (diff) | |
Fix decoders so that they use the passed in propq.
Fixes #21198
decoder objects were setting propq as NULL.
Added a set_ctx/settable_ctx to all decoders that should supply
a property query parameter to internal functions.
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21219)
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/x509.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/crypto/x509.h b/include/crypto/x509.h index eaa43ba158..5765b9f719 100644 --- a/include/crypto/x509.h +++ b/include/crypto/x509.h @@ -336,7 +336,8 @@ int ossl_x509_PUBKEY_get0_libctx(OSSL_LIB_CTX **plibctx, const char **ppropq, ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey); X509_PUBKEY *ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, - long len, OSSL_LIB_CTX *libctx); + long len, OSSL_LIB_CTX *libctx, + const char *propq); void ossl_X509_PUBKEY_INTERNAL_free(X509_PUBKEY *xpub); RSA *ossl_d2i_RSA_PSS_PUBKEY(RSA **a, const unsigned char **pp, long length); |