mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
e077455e9e
Since OPENSSL_malloc() and friends report ERR_R_MALLOC_FAILURE, and
at least handle the file name and line number they are called from,
there's no need to report ERR_R_MALLOC_FAILURE where they are called
directly, or when SSLfatal() and RLAYERfatal() is used, the reason
`ERR_R_MALLOC_FAILURE` is changed to `ERR_R_CRYPTO_LIB`.
There were a number of places where `ERR_R_MALLOC_FAILURE` was reported
even though it was a function from a different sub-system that was
called. Those places are changed to report ERR_R_{lib}_LIB, where
{lib} is the name of that sub-system.
Some of them are tricky to get right, as we have a lot of functions
that belong in the ASN1 sub-system, and all the `sk_` calls or from
the CRYPTO sub-system.
Some extra adaptation was necessary where there were custom OPENSSL_malloc()
wrappers, and some bugs are fixed alongside these changes.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19301)
154 lines
2.8 KiB
C
154 lines
2.8 KiB
C
/*
|
|
* Copyright 2005-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include "ssl_local.h"
|
|
#include <openssl/bn.h>
|
|
|
|
struct pqueue_st {
|
|
pitem *items;
|
|
int count;
|
|
};
|
|
|
|
pitem *pitem_new(unsigned char *prio64be, void *data)
|
|
{
|
|
pitem *item = OPENSSL_malloc(sizeof(*item));
|
|
|
|
if (item == NULL)
|
|
return NULL;
|
|
|
|
memcpy(item->priority, prio64be, sizeof(item->priority));
|
|
item->data = data;
|
|
item->next = NULL;
|
|
return item;
|
|
}
|
|
|
|
void pitem_free(pitem *item)
|
|
{
|
|
OPENSSL_free(item);
|
|
}
|
|
|
|
pqueue *pqueue_new(void)
|
|
{
|
|
pqueue *pq = OPENSSL_zalloc(sizeof(*pq));
|
|
|
|
return pq;
|
|
}
|
|
|
|
void pqueue_free(pqueue *pq)
|
|
{
|
|
OPENSSL_free(pq);
|
|
}
|
|
|
|
pitem *pqueue_insert(pqueue *pq, pitem *item)
|
|
{
|
|
pitem *curr, *next;
|
|
|
|
if (pq->items == NULL) {
|
|
pq->items = item;
|
|
return item;
|
|
}
|
|
|
|
for (curr = NULL, next = pq->items;
|
|
next != NULL; curr = next, next = next->next) {
|
|
/*
|
|
* we can compare 64-bit value in big-endian encoding with memcmp:-)
|
|
*/
|
|
int cmp = memcmp(next->priority, item->priority, 8);
|
|
if (cmp > 0) { /* next > item */
|
|
item->next = next;
|
|
|
|
if (curr == NULL)
|
|
pq->items = item;
|
|
else
|
|
curr->next = item;
|
|
|
|
return item;
|
|
}
|
|
|
|
else if (cmp == 0) /* duplicates not allowed */
|
|
return NULL;
|
|
}
|
|
|
|
item->next = NULL;
|
|
curr->next = item;
|
|
|
|
return item;
|
|
}
|
|
|
|
pitem *pqueue_peek(pqueue *pq)
|
|
{
|
|
return pq->items;
|
|
}
|
|
|
|
pitem *pqueue_pop(pqueue *pq)
|
|
{
|
|
pitem *item = pq->items;
|
|
|
|
if (pq->items != NULL)
|
|
pq->items = pq->items->next;
|
|
|
|
return item;
|
|
}
|
|
|
|
pitem *pqueue_find(pqueue *pq, unsigned char *prio64be)
|
|
{
|
|
pitem *next;
|
|
pitem *found = NULL;
|
|
|
|
if (pq->items == NULL)
|
|
return NULL;
|
|
|
|
for (next = pq->items; next->next != NULL; next = next->next) {
|
|
if (memcmp(next->priority, prio64be, 8) == 0) {
|
|
found = next;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* check the one last node */
|
|
if (memcmp(next->priority, prio64be, 8) == 0)
|
|
found = next;
|
|
|
|
if (!found)
|
|
return NULL;
|
|
|
|
return found;
|
|
}
|
|
|
|
pitem *pqueue_iterator(pqueue *pq)
|
|
{
|
|
return pqueue_peek(pq);
|
|
}
|
|
|
|
pitem *pqueue_next(piterator *item)
|
|
{
|
|
pitem *ret;
|
|
|
|
if (item == NULL || *item == NULL)
|
|
return NULL;
|
|
|
|
/* *item != NULL */
|
|
ret = *item;
|
|
*item = (*item)->next;
|
|
|
|
return ret;
|
|
}
|
|
|
|
size_t pqueue_size(pqueue *pq)
|
|
{
|
|
pitem *item = pq->items;
|
|
size_t count = 0;
|
|
|
|
while (item != NULL) {
|
|
count++;
|
|
item = item->next;
|
|
}
|
|
return count;
|
|
}
|