import OpenSSL-1.0.0a

3 files changed, 38 insertions, 23 deletions

diff --git a/src/lib/libcrypto/pqueue/Makefile b/src/lib/libcrypto/pqueue/Makefile
index 36bfc349aa..fb36a0c876 100644
--- a/src/lib/libcrypto/pqueue/Makefile
+++ b/src/lib/libcrypto/pqueue/Makefile
@@ -22,7 +22,7 @@ LIBOBJ=pqueue.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= pqueue.h pq_compat.h
+EXHEADER= pqueue.h
 HEADER= $(EXHEADER)
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -33,7 +33,7 @@ top:
 all:    lib
 
 lib:    $(LIBOBJ)
-        $(ARX) $(LIB) $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
         $(RANLIB) $(LIB) || echo Never mind.
         @touch lib
 
@@ -79,6 +79,5 @@ pqueue.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 pqueue.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 pqueue.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 pqueue.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-pqueue.o: ../../include/openssl/pq_compat.h ../../include/openssl/safestack.h
-pqueue.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-pqueue.o: ../cryptlib.h pqueue.c pqueue.h
+pqueue.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+pqueue.o: ../../include/openssl/symhacks.h ../cryptlib.h pqueue.c pqueue.h
diff --git a/src/lib/libcrypto/pqueue/pqueue.c b/src/lib/libcrypto/pqueue/pqueue.c
index 5cc18527f8..99a6fb874d 100644
--- a/src/lib/libcrypto/pqueue/pqueue.c
+++ b/src/lib/libcrypto/pqueue/pqueue.c
@@ -68,13 +68,12 @@ typedef struct _pqueue
         } pqueue_s;
 
 pitem *
-pitem_new(PQ_64BIT priority, void *data)
+pitem_new(unsigned char *prio64be, void *data)
         {
         pitem *item = (pitem *) OPENSSL_malloc(sizeof(pitem));
         if (item == NULL) return NULL;
 
-        pq_64bit_init(&(item->priority));
-        pq_64bit_assign(&item->priority, &priority);
+        memcpy(item->priority,prio64be,sizeof(item->priority));
 
         item->data = data;
         item->next = NULL;
@@ -87,7 +86,6 @@ pitem_free(pitem *item)
         {
         if (item == NULL) return;
 
-        pq_64bit_free(&(item->priority));
         OPENSSL_free(item);
         }
 
@@ -124,7 +122,10 @@ pqueue_insert(pqueue_s *pq, pitem *item)
                 next != NULL;
                 curr = next, next = next->next)
                 {
-                if (pq_64bit_gt(&(next->priority), &(item->priority)))
+                /* 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;
 
@@ -135,8 +136,8 @@ pqueue_insert(pqueue_s *pq, pitem *item)
 
                         return item;
                         }
-                /* duplicates not allowed */
-                if (pq_64bit_eq(&(item->priority), &(next->priority)))
+                
+                else if (cmp == 0)      /* duplicates not allowed */
                         return NULL;
                 }
 
@@ -164,7 +165,7 @@ pqueue_pop(pqueue_s *pq)
         }
 
 pitem *
-pqueue_find(pqueue_s *pq, PQ_64BIT priority)
+pqueue_find(pqueue_s *pq, unsigned char *prio64be)
         {
         pitem *next, *prev = NULL;
         pitem *found = NULL;
@@ -175,7 +176,7 @@ pqueue_find(pqueue_s *pq, PQ_64BIT priority)
         for ( next = pq->items; next->next != NULL; 
                   prev = next, next = next->next)
                 {
-                if ( pq_64bit_eq(&(next->priority), &priority))
+                if ( memcmp(next->priority, prio64be,8) == 0)
                         {
                         found = next;
                         break;
@@ -183,7 +184,7 @@ pqueue_find(pqueue_s *pq, PQ_64BIT priority)
                 }
         
         /* check the one last node */
-        if ( pq_64bit_eq(&(next->priority), &priority))
+        if ( memcmp(next->priority, prio64be,8) ==0)
                 found = next;
 
         if ( ! found)
@@ -199,7 +200,6 @@ pqueue_find(pqueue_s *pq, PQ_64BIT priority)
         return found;
         }
 
-#if PQ_64BIT_IS_INTEGER
 void
 pqueue_print(pqueue_s *pq)
         {
@@ -207,11 +207,14 @@ pqueue_print(pqueue_s *pq)
 
         while(item != NULL)
                 {
-                printf("item\t" PQ_64BIT_PRINT "\n", item->priority);
+                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;
                 }
         }
-#endif
 
 pitem *
 pqueue_iterator(pqueue_s *pq)
@@ -234,3 +237,17 @@ pqueue_next(pitem **item)
 
         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
index 02386d130e..87fc9037c8 100644
--- a/src/lib/libcrypto/pqueue/pqueue.h
+++ b/src/lib/libcrypto/pqueue/pqueue.h
@@ -64,20 +64,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/pq_compat.h>
-
 typedef struct _pqueue *pqueue;
 
 typedef struct _pitem
         {
-        PQ_64BIT priority;
+        unsigned char priority[8]; /* 64-bit value in big-endian encoding */
         void *data;
         struct _pitem *next;
         } pitem;
 
 typedef struct _pitem *piterator;
 
-pitem *pitem_new(PQ_64BIT priority, void *data);
+pitem *pitem_new(unsigned char *prio64be, void *data);
 void   pitem_free(pitem *item);
 
 pqueue pqueue_new(void);
@@ -86,10 +84,11 @@ 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, PQ_64BIT priority);
+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 */