Move the `pqueue' part of libcrypto, which is a glorified sorted linked list

of 64-bit data, and only used by DTLS, to libssl where it belongs.

Remove pqueue_print() which is a debugging interface and serves no useful
purpose, except for the regress test, which grows its own pqueue_print()
routine.

Bump libcrypto major and libssl minor.

WARNING: do not update your tree right now, more changes are coming, which
will ride the libcrypto major bump.

5 files changed, 5 insertions, 340 deletions

diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 5fefdb1cf0..ce04ac9e61 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2014/05/04 17:12:19 miod Exp $
+# $OpenBSD: Makefile,v 1.32 2014/05/12 19:14:14 miod Exp $
 
 LIB=    crypto
 
@@ -198,9 +198,6 @@ SRCS+= p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c
 SRCS+= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c
 SRCS+= pk7_mime.c bio_pk7.c
 
-# pqueue/
-SRCS+= pqueue.c
-
 # rand/
 SRCS+= randfile.c rand_lib.c rand_err.c
 
@@ -304,7 +301,6 @@ SRCS+= v3_asid.c v3_addr.c
         ${LCRYPTO_SRC}/perlasm \
         ${LCRYPTO_SRC}/pkcs12 \
         ${LCRYPTO_SRC}/pkcs7 \
-        ${LCRYPTO_SRC}/pqueue \
         ${LCRYPTO_SRC}/rand \
         ${LCRYPTO_SRC}/rc2 \
         ${LCRYPTO_SRC}/rc4 \
@@ -367,7 +363,6 @@ HDRS=\
         crypto/pem/pem2.h \
         crypto/pkcs12/pkcs12.h \
         crypto/pkcs7/pkcs7.h \
-        crypto/pqueue/pqueue.h \
         crypto/rand/rand.h \
         crypto/rc2/rc2.h \
         crypto/rc4/rc4.h \
diff --git a/src/lib/libcrypto/crypto/shlib_version b/src/lib/libcrypto/crypto/shlib_version
index 72168dfd16..54ef0c4cc0 100644
--- a/src/lib/libcrypto/crypto/shlib_version
+++ b/src/lib/libcrypto/crypto/shlib_version
@@ -1,2 +1,2 @@
-major=26
-minor=1
+major=27
+minor=0
diff --git a/src/lib/libcrypto/pqueue/pqueue.c b/src/lib/libcrypto/pqueue/pqueue.c
deleted file mode 100644
index fc68ae19c3..0000000000
--- a/src/lib/libcrypto/pqueue/pqueue.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* crypto/pqueue/pqueue.c */
-/*
- * 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 "cryptlib.h"
-#include <openssl/bn.h>
-#include "pqueue.h"
-
-typedef struct _pqueue {
-        pitem *items;
-        int count;
-} pqueue_s;
-
-pitem *
-pitem_new(unsigned char *prio64be, void *data)
-{
-        pitem *item = (pitem *)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;
-
-        free(item);
-}
-
-pqueue_s *
-pqueue_new(void)
-{
-        pqueue_s *pq = (pqueue_s *)malloc(sizeof(pqueue_s));
-
-        if (pq == NULL)
-                return NULL;
-
-        memset(pq, 0x00, sizeof(pqueue_s));
-        return pq;
-}
-
-void
-pqueue_free(pqueue_s *pq)
-{
-        if (pq == NULL)
-                return;
-
-        free(pq);
-}
-
-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_peek(pqueue_s *pq)
-{
-        return pq->items;
-}
-
-pitem *
-pqueue_pop(pqueue_s *pq)
-{
-        pitem *item = pq->items;
-
-        if (pq->items != NULL)
-                pq->items = pq->items->next;
-
-        return item;
-}
-
-pitem *
-pqueue_find(pqueue_s *pq, unsigned char *prio64be)
-{
-        pitem *next;
-        pitem *found = NULL;
-
-        if (pq->items == NULL)
-                return NULL;
-
-        for (next = pq->items; next != NULL; next = next->next) {
-                if (memcmp(next->priority, prio64be, 8) == 0) {
-                        found = next;
-                        break;
-                }
-        }
-
-        if (!found)
-                return NULL;
-
-        return found;
-}
-
-void
-pqueue_print(pqueue_s *pq)
-{
-        pitem *item = pq->items;
-
-        while (item != NULL) {
-                printf("item\t%02x%02x%02x%02x%02x%02x%02x%02x\n",
-                    item->priority[0], item->priority[1],
-                    item->priority[2], item->priority[3],
-                    item->priority[4], item->priority[5],
-                    item->priority[6], item->priority[7]);
-                item = item->next;
-        }
-}
-
-pitem *
-pqueue_iterator(pqueue_s *pq)
-{
-        return pqueue_peek(pq);
-}
-
-pitem *
-pqueue_next(pitem **item)
-{
-        pitem *ret;
-
-        if (item == NULL || *item == NULL)
-                return NULL;
-
-        /* *item != NULL */
-        ret = *item;
-        *item = (*item)->next;
-
-        return ret;
-}
-
-int
-pqueue_size(pqueue_s *pq)
-{
-        pitem *item = pq->items;
-        int count = 0;
-
-        while (item != NULL) {
-                count++;
-                item = item->next;
-        }
-        return count;
-}
diff --git a/src/lib/libcrypto/pqueue/pqueue.h b/src/lib/libcrypto/pqueue/pqueue.h
deleted file mode 100644
index 729e9abaf2..0000000000
--- a/src/lib/libcrypto/pqueue/pqueue.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* crypto/pqueue/pqueue.h */
-/*
- * 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 HEADER_PQUEUE_H
-#define HEADER_PQUEUE_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef struct _pqueue *pqueue;
-
-typedef struct _pitem {
-        unsigned char priority[8]; /* 64-bit value in big-endian encoding */
-        void *data;
-        struct _pitem *next;
-} pitem;
-
-typedef struct _pitem *piterator;
-
-pitem *pitem_new(unsigned char *prio64be, void *data);
-void   pitem_free(pitem *item);
-
-pqueue pqueue_new(void);
-void   pqueue_free(pqueue pq);
-
-pitem *pqueue_insert(pqueue pq, pitem *item);
-pitem *pqueue_peek(pqueue pq);
-pitem *pqueue_pop(pqueue pq);
-pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
-pitem *pqueue_iterator(pqueue pq);
-pitem *pqueue_next(piterator *iter);
-
-void   pqueue_print(pqueue pq);
-int    pqueue_size(pqueue pq);
-
-#endif /* ! HEADER_PQUEUE_H */
diff --git a/src/lib/libcrypto/shlib_version b/src/lib/libcrypto/shlib_version
index 72168dfd16..54ef0c4cc0 100644
--- a/src/lib/libcrypto/shlib_version
+++ b/src/lib/libcrypto/shlib_version
@@ -1,2 +1,2 @@
-major=26
-minor=1
+major=27
+minor=0