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.

4 files changed, 6 insertions, 22 deletions

diff --git a/lib/libcrypto/shlib_version b/lib/libcrypto/shlib_version
index 72168dfd16a..54ef0c4cc0c 100644
--- a/lib/libcrypto/shlib_version
+++ b/lib/libcrypto/shlib_version
@@ -1,2 +1,2 @@
-major=26
-minor=1
+major=27
+minor=0
diff --git a/lib/libcrypto/pqueue/pqueue.c b/lib/libssl/pqueue.c
index fc68ae19c3d..99c118c3b6f 100644
--- a/lib/libcrypto/pqueue/pqueue.c
+++ b/lib/libssl/pqueue.c
@@ -57,8 +57,7 @@
  *
  */
 
-#include "cryptlib.h"
-#include <openssl/bn.h>
+#include <string.h>
 #include "pqueue.h"
 
 typedef struct _pqueue {
@@ -175,7 +174,8 @@ pqueue_find(pqueue_s *pq, unsigned char *prio64be)
 		return NULL;
 
 	for (next = pq->items; next != NULL; next = next->next) {
-		if (memcmp(next->priority, prio64be, 8) == 0) {
+		if (memcmp(next->priority, prio64be,
+		    sizeof(next->priority)) == 0) {
 			found = next;
 			break;
 		}
@@ -187,21 +187,6 @@ pqueue_find(pqueue_s *pq, unsigned char *prio64be)
 	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)
 {
diff --git a/lib/libcrypto/pqueue/pqueue.h b/lib/libssl/pqueue.h
index 729e9abaf25..6e7df8f35b7 100644
--- a/lib/libcrypto/pqueue/pqueue.h
+++ b/lib/libssl/pqueue.h
@@ -87,7 +87,6 @@ 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/lib/libssl/shlib_version b/lib/libssl/shlib_version
index 906022aa66d..aa54cbb404e 100644
--- a/lib/libssl/shlib_version
+++ b/lib/libssl/shlib_version
@@ -1,2 +1,2 @@
 major=24
-minor=0
+minor=1