1 files changed, 46 insertions, 39 deletions

diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c
index 76cf1a1168..378bd7c796 100644
--- a/src/lib/libcrypto/stack/stack.c
+++ b/src/lib/libcrypto/stack/stack.c
@@ -77,10 +77,10 @@ const char STACK_version[]="Stack" OPENSSL_VERSION_PTEXT;
 
 #include <errno.h>
 
-int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void *, const void *)))
-                (const void *, const void *)
+int (*sk_set_cmp_func(STACK *sk, int (*c)(const char * const *,const char * const *)))
+                (const char * const *, const char * const *)
         {
-        int (*old)(const void *,const void *)=sk->comp;
+        int (*old)(const char * const *,const char * const *)=sk->comp;
 
         if (sk->comp != c)
                 sk->sorted=0;
@@ -89,9 +89,9 @@ int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void *, const void *)))
         return old;
         }
 
-_STACK *sk_dup(_STACK *sk)
+STACK *sk_dup(STACK *sk)
         {
-        _STACK *ret;
+        STACK *ret;
         char **s;
 
         if ((ret=sk_new(sk->comp)) == NULL) goto err;
@@ -112,19 +112,19 @@ err:
         return(NULL);
         }
 
-_STACK *sk_new_null(void)
+STACK *sk_new_null(void)
         {
-        return sk_new((int (*)(const void *, const void *))0);
+        return sk_new((int (*)(const char * const *, const char * const *))0);
         }
 
-_STACK *sk_new(int (*c)(const void *, const void *))
+STACK *sk_new(int (*c)(const char * const *, const char * const *))
         {
-        _STACK *ret;
+        STACK *ret;
         int i;
 
-        if ((ret=OPENSSL_malloc(sizeof(_STACK))) == NULL)
+        if ((ret=(STACK *)OPENSSL_malloc(sizeof(STACK))) == NULL)
                 goto err;
-        if ((ret->data=OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL)
+        if ((ret->data=(char **)OPENSSL_malloc(sizeof(char *)*MIN_NODES)) == NULL)
                 goto err;
         for (i=0; i<MIN_NODES; i++)
                 ret->data[i]=NULL;
@@ -139,14 +139,14 @@ err:
         return(NULL);
         }
 
-int sk_insert(_STACK *st, void *data, int loc)
+int sk_insert(STACK *st, char *data, int loc)
         {
         char **s;
 
         if(st == NULL) return 0;
         if (st->num_alloc <= st->num+1)
                 {
-                s=OPENSSL_realloc((char *)st->data,
+                s=(char **)OPENSSL_realloc((char *)st->data,
                         (unsigned int)sizeof(char *)*st->num_alloc*2);
                 if (s == NULL)
                         return(0);
@@ -160,14 +160,14 @@ int sk_insert(_STACK *st, void *data, int loc)
                 int i;
                 char **f,**t;
 
-                f=st->data;
-                t=&(st->data[1]);
+                f=(char **)st->data;
+                t=(char **)&(st->data[1]);
                 for (i=st->num; i>=loc; i--)
                         t[i]=f[i];
                         
 #ifdef undef /* no memmove on sunos :-( */
-                memmove(&(st->data[loc+1]),
-                        &(st->data[loc]),
+                memmove( (char *)&(st->data[loc+1]),
+                        (char *)&(st->data[loc]),
                         sizeof(char *)*(st->num-loc));
 #endif
                 st->data[loc]=data;
@@ -177,7 +177,7 @@ int sk_insert(_STACK *st, void *data, int loc)
         return(st->num);
         }
 
-void *sk_delete_ptr(_STACK *st, void *p)
+char *sk_delete_ptr(STACK *st, char *p)
         {
         int i;
 
@@ -187,7 +187,7 @@ void *sk_delete_ptr(_STACK *st, void *p)
         return(NULL);
         }
 
-void *sk_delete(_STACK *st, int loc)
+char *sk_delete(STACK *st, int loc)
         {
         char *ret;
         int i,j;
@@ -210,11 +210,11 @@ void *sk_delete(_STACK *st, int loc)
         return(ret);
         }
 
-static int internal_find(_STACK *st, void *data, int ret_val_options)
+static int internal_find(STACK *st, char *data, int ret_val_options)
         {
-        const void * const *r;
+        char **r;
         int i;
-
+        int (*comp_func)(const void *,const void *);
         if(st == NULL) return -1;
 
         if (st->comp == NULL)
@@ -226,46 +226,53 @@ static int internal_find(_STACK *st, void *data, int ret_val_options)
                 }
         sk_sort(st);
         if (data == NULL) return(-1);
-        r=OBJ_bsearch_ex_(&data,st->data,st->num,sizeof(void *),st->comp,
-                          ret_val_options);
+        /* This (and the "qsort" below) are the two places in OpenSSL
+         * where we need to convert from our standard (type **,type **)
+         * compare callback type to the (void *,void *) type required by
+         * bsearch. However, the "data" it is being called(back) with are
+         * not (type *) pointers, but the *pointers* to (type *) pointers,
+         * so we get our extra level of pointer dereferencing that way. */
+        comp_func=(int (*)(const void *,const void *))(st->comp);
+        r=(char **)OBJ_bsearch_ex((char *)&data,(char *)st->data,
+                st->num,sizeof(char *),comp_func,ret_val_options);
         if (r == NULL) return(-1);
-        return (int)((char **)r-st->data);
+        return((int)(r-st->data));
         }
 
-int sk_find(_STACK *st, void *data)
+int sk_find(STACK *st, char *data)
         {
         return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);
         }
-int sk_find_ex(_STACK *st, void *data)
+int sk_find_ex(STACK *st, char *data)
         {
         return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH);
         }
 
-int sk_push(_STACK *st, void *data)
+int sk_push(STACK *st, char *data)
         {
         return(sk_insert(st,data,st->num));
         }
 
-int sk_unshift(_STACK *st, void *data)
+int sk_unshift(STACK *st, char *data)
         {
         return(sk_insert(st,data,0));
         }
 
-void *sk_shift(_STACK *st)
+char *sk_shift(STACK *st)
         {
         if (st == NULL) return(NULL);
         if (st->num <= 0) return(NULL);
         return(sk_delete(st,0));
         }
 
-void *sk_pop(_STACK *st)
+char *sk_pop(STACK *st)
         {
         if (st == NULL) return(NULL);
         if (st->num <= 0) return(NULL);
         return(sk_delete(st,st->num-1));
         }
 
-void sk_zero(_STACK *st)
+void sk_zero(STACK *st)
         {
         if (st == NULL) return;
         if (st->num <= 0) return;
@@ -273,7 +280,7 @@ void sk_zero(_STACK *st)
         st->num=0;
         }
 
-void sk_pop_free(_STACK *st, void (*func)(void *))
+void sk_pop_free(STACK *st, void (*func)(void *))
         {
         int i;
 
@@ -284,32 +291,32 @@ void sk_pop_free(_STACK *st, void (*func)(void *))
         sk_free(st);
         }
 
-void sk_free(_STACK *st)
+void sk_free(STACK *st)
         {
         if (st == NULL) return;
         if (st->data != NULL) OPENSSL_free(st->data);
         OPENSSL_free(st);
         }
 
-int sk_num(const _STACK *st)
+int sk_num(const STACK *st)
 {
         if(st == NULL) return -1;
         return st->num;
 }
 
-void *sk_value(const _STACK *st, int i)
+char *sk_value(const STACK *st, int i)
 {
         if(!st || (i < 0) || (i >= st->num)) return NULL;
         return st->data[i];
 }
 
-void *sk_set(_STACK *st, int i, void *value)
+char *sk_set(STACK *st, int i, char *value)
 {
         if(!st || (i < 0) || (i >= st->num)) return NULL;
         return (st->data[i] = value);
 }
 
-void sk_sort(_STACK *st)
+void sk_sort(STACK *st)
         {
         if (st && !st->sorted)
                 {
@@ -326,7 +333,7 @@ void sk_sort(_STACK *st)
                 }
         }
 
-int sk_is_sorted(const _STACK *st)
+int sk_is_sorted(const STACK *st)
         {
         if (!st)
                 return 1;