diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2025-09-08 03:20:42 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2026-06-07 16:57:09 +0000 |
| commit | 0f6e90c4cc4f9bb006de556b46db0dcb3283491a (patch) | |
| tree | 8941e073cf664ecc73ded6c7fa38c064c282e7f8 /crypto/openssl/ssl/priority_queue.c | |
| parent | 998de2d14e25c1246b8fe75f85c053e0b9781a8f (diff) | |
openssl: Update to 3.5.6 and associated fixes.
Included fixes:
OpenSSL: update Makefiles to reflect 3.5.1 release
(cherry picked from commit ee6882e6b1287aa910a4f74f5290ae397dbd5054)
crypto/openssl: fix importing new versions from pristine trees
(cherry picked from commit f43d0ac1b0e29bbd77d6b0b1c87dca075cd7b9bf)
openssl: import 3.5.5
(cherry picked from commit f775385affefd7beac0d038d5cd9cbf01bfc4a06)
OpenSSL: update vendor sources to match 3.5.5 content
(cherry picked from commit 12eecb3bcc0be4d7fd35847252c40998806fc551)
OpenSSL: install EVP_CIPHER_CTX_get_app_data.3 once
(cherry picked from commit b0476eea5ef4ab2ccf2479652f486af3d4ab9cc0)
MFV: crypto/openssl: update to 3.5.6
(cherry picked from commit e2fcde7333a515907316cf1a4ee4858edc90419d)
OpenSSL: commit sys/crypto changes for 3.5.5
(cherry picked from commit e6c8997a8958c7aaec8e266d2eeefbfaa137e218)
crypto/openssl: update artifacts to match 3.5.6 release artifacts
(cherry picked from commit 293c738aa45003423f45eb7f0e37f3047e52c502)
crypto/openssl: add new manpage from release 3.5.6
(cherry picked from commit 51a80be04fe63a8d6950a7524b3ca0d511ade131)
Approved by: so
Security: FreeBSD-EN-26:15.openssl
Security: CVE-2026-2673
Security: CVE-2026-28387
Security: CVE-2026-28388
Security: CVE-2026-28389
Security: CVE-2026-31789
Security: CVE-2026-31790
Diffstat (limited to 'crypto/openssl/ssl/priority_queue.c')
| -rw-r--r-- | crypto/openssl/ssl/priority_queue.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/crypto/openssl/ssl/priority_queue.c b/crypto/openssl/ssl/priority_queue.c index ed1d191f2e85..6f1de51b89d4 100644 --- a/crypto/openssl/ssl/priority_queue.c +++ b/crypto/openssl/ssl/priority_queue.c @@ -35,14 +35,14 @@ OSSL_SAFE_MATH_UNSIGNED(size_t, size_t) */ struct pq_heap_st { - void *data; /* User supplied data pointer */ - size_t index; /* Constant index in elements[] */ + void *data; /* User supplied data pointer */ + size_t index; /* Constant index in elements[] */ }; struct pq_elem_st { - size_t posn; /* Current index in heap[] or link in free list */ + size_t posn; /* Current index in heap[] or link in free list */ #ifndef NDEBUG - int used; /* Debug flag indicating that this is in use */ + int used; /* Debug flag indicating that this is in use */ #endif }; @@ -50,29 +50,27 @@ struct ossl_pqueue_st { struct pq_heap_st *heap; struct pq_elem_st *elements; int (*compare)(const void *, const void *); - size_t htop; /* Highest used heap element */ - size_t hmax; /* Allocated heap & element space */ - size_t freelist; /* Index into elements[], start of free element list */ + size_t htop; /* Highest used heap element */ + size_t hmax; /* Allocated heap & element space */ + size_t freelist; /* Index into elements[], start of free element list */ }; /* * The initial and maximum number of elements in the heap. */ static const size_t min_nodes = 8; -static const size_t max_nodes = - SIZE_MAX / (sizeof(struct pq_heap_st) > sizeof(struct pq_elem_st) - ? sizeof(struct pq_heap_st) : sizeof(struct pq_elem_st)); +static const size_t max_nodes = SIZE_MAX / (sizeof(struct pq_heap_st) > sizeof(struct pq_elem_st) ? sizeof(struct pq_heap_st) : sizeof(struct pq_elem_st)); #ifndef NDEBUG /* Some basic sanity checking of the data structure */ -# define ASSERT_USED(pq, idx) \ - assert(pq->elements[pq->heap[idx].index].used); \ +#define ASSERT_USED(pq, idx) \ + assert(pq->elements[pq->heap[idx].index].used); \ assert(pq->elements[pq->heap[idx].index].posn == idx) -# define ASSERT_ELEM_USED(pq, elem) \ +#define ASSERT_ELEM_USED(pq, elem) \ assert(pq->elements[elem].used) #else -# define ASSERT_USED(pq, idx) -# define ASSERT_ELEM_USED(pq, elem) +#define ASSERT_USED(pq, idx) +#define ASSERT_ELEM_USED(pq, elem) #endif /* |
