diff options
| author | slontis <shane.lontis@oracle.com> | 2023-06-16 08:40:06 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-08-16 18:02:51 +0200 |
| commit | 39ed7636e0d8a90512e7ccb811cd0bfcb7a79650 (patch) | |
| tree | da7067bfcf6d7f78574185a3152db9581a6aaa3c /crypto/x509 | |
| parent | Improve documentation for BIO_s_mem (diff) | |
| download | openssl-39ed7636e0d8a90512e7ccb811cd0bfcb7a79650.tar.xz openssl-39ed7636e0d8a90512e7ccb811cd0bfcb7a79650.zip | |
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 'crypto/x509')
| -rw-r--r-- | crypto/x509/x_pubkey.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c index ec7d74af5f..ed10e0fbc2 100644 --- a/crypto/x509/x_pubkey.c +++ b/crypto/x509/x_pubkey.c @@ -66,7 +66,8 @@ ASN1_SEQUENCE(X509_PUBKEY_INTERNAL) = { } static_ASN1_SEQUENCE_END_name(X509_PUBKEY, X509_PUBKEY_INTERNAL) 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) { X509_PUBKEY *xpub = OPENSSL_zalloc(sizeof(*xpub)); @@ -74,7 +75,7 @@ X509_PUBKEY *ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, return NULL; return (X509_PUBKEY *)ASN1_item_d2i_ex((ASN1_VALUE **)&xpub, pp, len, ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL), - libctx, NULL); + libctx, propq); } void ossl_X509_PUBKEY_INTERNAL_free(X509_PUBKEY *xpub) |