diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-29 12:41:18 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-04-28 11:19:34 +0200 |
| commit | 5fd7eb5c8a45e8aba7a2610dfcfbcfb2eb6c1aec (patch) | |
| tree | 7ca22c60cb7add699a18d8e6d78e97282a72db9c /include | |
| parent | e1491a2f15a985e642043f234240953886d2f989 (diff) | |
Improve the implementation of X509_STORE_CTX_get1_issuer()
It is possible for the stack of X509_OBJECTs held in an X509_STORE_CTX to
have a custom compare function associated with it. Normally (by default)
this uses X509_NAME_cmp(). The X509_STORE_CTX_get1_issuer() function
assumed that it would always be X509_NAME_cmp().
By implementing OPENSSL_sk_find_all() function we can avoid explicitly
using X509_NAME_cmp() in X509_STORE_CTX_get1_issuer().
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14728)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/safestack.h.in | 4 | ||||
| -rw-r--r-- | include/openssl/stack.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/openssl/safestack.h.in b/include/openssl/safestack.h.in index aac56608ca..7bd4410dfc 100644 --- a/include/openssl/safestack.h.in +++ b/include/openssl/safestack.h.in @@ -146,6 +146,10 @@ extern "C" { { \ return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (const void *)ptr); \ } \ + static ossl_unused ossl_inline int sk_##t1##_find_all(STACK_OF(t1) *sk, t2 *ptr, int *pnum) \ + { \ + return OPENSSL_sk_find_all((OPENSSL_STACK *)sk, (const void *)ptr, pnum); \ + } \ static ossl_unused ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk) \ { \ OPENSSL_sk_sort((OPENSSL_STACK *)sk); \ diff --git a/include/openssl/stack.h b/include/openssl/stack.h index 031b672ed1..79c25030cb 100644 --- a/include/openssl/stack.h +++ b/include/openssl/stack.h @@ -45,6 +45,7 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc); void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p); int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data); int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data); +int OPENSSL_sk_find_all(OPENSSL_STACK *st, const void *data, int *pnum); int OPENSSL_sk_push(OPENSSL_STACK *st, const void *data); int OPENSSL_sk_unshift(OPENSSL_STACK *st, const void *data); void *OPENSSL_sk_shift(OPENSSL_STACK *st); |