Remove pqueue.
It has no remaining users.
Change-Id: I7d02132296d56af4f8b2810a1ba83f845cd3432c
Reviewed-on: https://boringssl-review.googlesource.com/8438
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/include/openssl/pqueue.h b/include/openssl/pqueue.h
deleted file mode 100644
index ceb1fa2..0000000
--- a/include/openssl/pqueue.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com). */
-
-#ifndef OPENSSL_HEADER_PQUEUE_H
-#define OPENSSL_HEADER_PQUEUE_H
-
-#include <openssl/base.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-
-/* Priority queue.
- *
- * The priority queue maintains a linked-list of nodes, each with a unique,
- * 64-bit priority, in ascending priority order. */
-
-typedef struct _pqueue *pqueue;
-
-typedef struct _pitem {
- uint8_t priority[8]; /* 64-bit value in big-endian encoding */
- void *data;
- struct _pitem *next;
-} pitem;
-
-typedef struct _pitem *piterator;
-
-
-/* Creating and freeing queues. */
-
-/* pqueue_new allocates a fresh, empty priority queue object and returns it, or
- * NULL on error. */
-OPENSSL_EXPORT pqueue pqueue_new(void);
-
-/* pqueue_free frees |pq| but not any of the items it points to. Thus |pq| must
- * be empty or a memory leak will occur. */
-OPENSSL_EXPORT void pqueue_free(pqueue pq);
-
-
-/* Creating and freeing items. */
-
-/* pitem_new allocates a fresh priority queue item that points at |data| and
- * has a priority given by |prio64be|, which is a 64-bit, unsigned number
- * expressed in big-endian form. It returns the fresh item, or NULL on
- * error. */
-OPENSSL_EXPORT pitem *pitem_new(uint8_t prio64be[8], void *data);
-
-/* pitem_free frees |item|, but not any data that it points to. */
-OPENSSL_EXPORT void pitem_free(pitem *item);
-
-
-/* Queue accessor functions */
-
-/* pqueue_peek returns the item with the smallest priority from |pq|, or NULL
- * if empty. */
-OPENSSL_EXPORT pitem *pqueue_peek(pqueue pq);
-
-/* pqueue_find returns the item whose priority matches |prio64be| or NULL if no
- * such item exists. */
-OPENSSL_EXPORT pitem *pqueue_find(pqueue pq, uint8_t *prio64be);
-
-
-/* Queue mutation functions */
-
-/* pqueue_insert inserts |item| into |pq| and returns item. */
-OPENSSL_EXPORT pitem *pqueue_insert(pqueue pq, pitem *item);
-
-/* pqueue_pop takes the item with the least priority from |pq| and returns it,
- * or NULL if |pq| is empty. */
-OPENSSL_EXPORT pitem *pqueue_pop(pqueue pq);
-
-/* pqueue_size returns the number of items in |pq|. */
-OPENSSL_EXPORT size_t pqueue_size(pqueue pq);
-
-
-/* Iterating */
-
-/* pqueue_iterator returns an iterator that can be used to iterate over the
- * contents of the queue. */
-OPENSSL_EXPORT piterator pqueue_iterator(pqueue pq);
-
-/* pqueue_next returns the current value of |iter| and advances it to the next
- * position. If the iterator has advanced over all the elements, it returns
- * NULL. */
-OPENSSL_EXPORT pitem *pqueue_next(piterator *iter);
-
-
-#if defined(__cplusplus)
-} /* extern C */
-#endif
-
-#endif /* OPENSSL_HEADER_PQUEUE_H */
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index e17e1f2..2716241 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -1,7 +1,5 @@
include_directories(../include)
-add_subdirectory(pqueue)
-
add_library(
ssl
@@ -33,8 +31,6 @@
t1_enc.c
t1_lib.c
tls_record.c
-
- $<TARGET_OBJECTS:pqueue>
)
target_link_libraries(ssl crypto)
diff --git a/ssl/pqueue/CMakeLists.txt b/ssl/pqueue/CMakeLists.txt
deleted file mode 100644
index 3a8b82b..0000000
--- a/ssl/pqueue/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-include_directories(../../include)
-
-add_library(
- pqueue
-
- OBJECT
-
- pqueue.c
-)
-
-add_executable(
- pqueue_test
-
- pqueue_test.c
-
- $<TARGET_OBJECTS:test_support>
-)
-
-target_link_libraries(pqueue_test ssl crypto)
-add_dependencies(all_tests pqueue_test)
diff --git a/ssl/pqueue/pqueue.c b/ssl/pqueue/pqueue.c
deleted file mode 100644
index e689761..0000000
--- a/ssl/pqueue/pqueue.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- * software must display the following acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- * endorse or promote products derived from this software without
- * prior written permission. For written permission, please contact
- * openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- * nor may "OpenSSL" appear in their names without prior written
- * permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- * acknowledgment:
- * "This product includes software developed by the OpenSSL Project
- * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com). */
-
-#include <openssl/pqueue.h>
-
-#include <assert.h>
-#include <string.h>
-
-#include <openssl/mem.h>
-
-
-typedef struct _pqueue {
- pitem *items;
- unsigned count;
-} pqueue_s;
-
-
-pitem *pitem_new(uint8_t prio64be[8], void *data) {
- pitem *item = OPENSSL_malloc(sizeof(pitem));
- 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) {
- if (item == NULL) {
- return;
- }
-
- OPENSSL_free(item);
-}
-
-pqueue pqueue_new(void) {
- pqueue_s *pq = OPENSSL_malloc(sizeof(pqueue_s));
- if (pq == NULL) {
- return NULL;
- }
-
- memset(pq, 0, sizeof(pqueue_s));
- return pq;
-}
-
-void pqueue_free(pqueue_s *pq) {
- if (pq == NULL) {
- return;
- }
-
- /* The queue must be empty. */
- assert(pq->items == NULL);
- OPENSSL_free(pq);
-}
-
-pitem *pqueue_peek(pqueue_s *pq) { return pq->items; }
-
-pitem *pqueue_find(pqueue_s *pq, uint8_t *prio64be) {
- pitem *curr;
-
- for (curr = pq->items; curr; curr = curr->next) {
- if (memcmp(curr->priority, prio64be, sizeof(curr->priority)) == 0) {
- return curr;
- }
- }
-
- return NULL;
-}
-
-size_t pqueue_size(pqueue_s *pq) {
- pitem *item = pq->items;
- size_t count = 0;
-
- while (item != NULL) {
- count++;
- item = item->next;
- }
- return count;
-}
-
-piterator pqueue_iterator(pqueue_s *pq) { return pq->items; }
-
-pitem *pqueue_next(piterator *item) {
- pitem *ret;
-
- if (item == NULL || *item == NULL) {
- return NULL;
- }
-
- ret = *item;
- *item = (*item)->next;
-
- return ret;
-}
-
-pitem *pqueue_insert(pqueue_s *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, sizeof(item->priority));
- 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_pop(pqueue_s *pq) {
- pitem *item = pq->items;
-
- if (pq->items != NULL) {
- pq->items = pq->items->next;
- }
-
- return item;
-}
diff --git a/ssl/pqueue/pqueue_test.c b/ssl/pqueue/pqueue_test.c
deleted file mode 100644
index f76e4a3..0000000
--- a/ssl/pqueue/pqueue_test.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright (c) 2014, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-
-#include <stdio.h>
-#include <string.h>
-
-#include <openssl/crypto.h>
-#include <openssl/pqueue.h>
-#include <openssl/ssl.h>
-
-
-static void clear_and_free_queue(pqueue q) {
- for (;;) {
- pitem *item = pqueue_pop(q);
- if (item == NULL) {
- break;
- }
- pitem_free(item);
- }
- pqueue_free(q);
-}
-
-static int trivial(void) {
- pqueue q = pqueue_new();
- if (q == NULL) {
- return 0;
- }
- int32_t data = 0xdeadbeef;
- uint8_t priority[8] = {0};
- pitem *item = pitem_new(priority, &data);
- if (item == NULL ||
- pqueue_insert(q, item) != item ||
- pqueue_size(q) != 1 ||
- pqueue_peek(q) != item ||
- pqueue_pop(q) != item ||
- pqueue_size(q) != 0 ||
- pqueue_pop(q) != NULL) {
- return 0;
- }
- pitem_free(item);
- clear_and_free_queue(q);
- return 1;
-}
-
-#define NUM_ITEMS 10
-
-static int fixed_random(void) {
- /* Random order of 10 elements, chosen by
- * random.choice(list(itertools.permutations(range(10)))) */
- int ordering[NUM_ITEMS] = {9, 6, 3, 4, 0, 2, 7, 1, 8, 5};
- int i;
- pqueue q = pqueue_new();
- uint8_t priority[8] = {0};
- piterator iter;
- pitem *curr, *item;
-
- if (q == NULL) {
- return 0;
- }
-
- /* Insert the elements */
- for (i = 0; i < NUM_ITEMS; i++) {
- priority[7] = ordering[i];
- item = pitem_new(priority, &ordering[i]);
- if (item == NULL || pqueue_insert(q, item) != item) {
- return 0;
- }
- }
-
- /* Insert the elements again. This inserts duplicates and should
- * fail. */
- for (i = 0; i < NUM_ITEMS; i++) {
- priority[7] = ordering[i];
- item = pitem_new(priority, &ordering[i]);
- if (item == NULL || pqueue_insert(q, item) != NULL) {
- return 0;
- }
- pitem_free(item);
- }
-
- if (pqueue_size(q) != NUM_ITEMS) {
- return 0;
- }
-
- /* Iterate over the elements. */
- iter = pqueue_iterator(q);
- curr = pqueue_next(&iter);
- if (curr == NULL) {
- return 0;
- }
- while (1) {
- pitem *next = pqueue_next(&iter);
- int *curr_data, *next_data;
-
- if (next == NULL) {
- break;
- }
- curr_data = (int*)curr->data;
- next_data = (int*)next->data;
- if (*curr_data >= *next_data) {
- return 0;
- }
- curr = next;
- }
- clear_and_free_queue(q);
- return 1;
-}
-
-int main(void) {
- CRYPTO_library_init();
-
- if (!trivial() || !fixed_random()) {
- return 1;
- }
-
- printf("PASS\n");
- return 0;
-}
diff --git a/util/all_tests.json b/util/all_tests.json
index 48b540e..2d5664f 100644
--- a/util/all_tests.json
+++ b/util/all_tests.json
@@ -65,6 +65,5 @@
["crypto/x509v3/tab_test"],
["crypto/x509v3/v3name_test"],
["decrepit/ripemd/ripemd_test"],
- ["ssl/pqueue/pqueue_test"],
["ssl/ssl_test"]
]
