Ensure that x**0 mod 1 = 0.

[oweals/openssl.git] / crypto / stack / stack.c

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index a58229a18c2578a3fcfb046edaf2d35a8d605e0c..980bb684428fc655a2172600eed6608f2bed5e62 100644 (file)
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -77,11 +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 *,
-                                          const void * const *)))
-               (const void * const *, const void * const *)
+int (*sk_set_cmp_func(_STACK *sk, int (*c)(const void *, const void *)))
+               (const void *, const void *)
        {
-       int (*old)(const void * const *,const void * const *)=sk->comp;
+       int (*old)(const void *,const void *)=sk->comp;
 
        if (sk->comp != c)
                sk->sorted=0;
@@ -113,12 +112,49 @@ err:
        return(NULL);
        }
 
+_STACK *sk_deep_copy(_STACK *sk, void *(*copy_func)(void *),
+                        void (*free_func)(void *))
+       {
+       _STACK *ret;
+       int i;
+
+       if ((ret = OPENSSL_malloc(sizeof(_STACK))) == NULL)
+               return ret;
+       ret->comp = sk->comp;
+       ret->sorted = sk->sorted;
+       ret->num = sk->num;
+       ret->num_alloc = sk->num > MIN_NODES ? sk->num : MIN_NODES;
+       ret->data = OPENSSL_malloc(sizeof(char *) * ret->num_alloc);
+       if (ret->data == NULL)
+               {
+               OPENSSL_free(ret);
+               return NULL;
+               }
+       for (i = 0; i < ret->num_alloc; i++)
+               ret->data[i] = NULL;
+
+       for (i = 0; i < ret->num; ++i)
+               {
+               if (sk->data[i] == NULL)
+                       continue;
+               if ((ret->data[i] = copy_func(sk->data[i])) == NULL)
+                       {
+                       while (--i >= 0)
+                               if (ret->data[i] != NULL)
+                                       free_func(ret->data[i]);
+                       sk_free(ret);
+                       return NULL;
+                       }
+               }
+       return ret;
+       }
+
 _STACK *sk_new_null(void)
        {
-       return sk_new((int (*)(const void * const *, const void * const *))0);
+       return sk_new((int (*)(const void *, const void *))0);
        }
 
-_STACK *sk_new(int (*c)(const void * const *, const void * const *))
+_STACK *sk_new(int (*c)(const void *, const void *))
        {
        _STACK *ret;
        int i;
@@ -213,9 +249,9 @@ void *sk_delete(_STACK *st, int loc)
 
 static int internal_find(_STACK *st, void *data, int ret_val_options)
        {
-       char **r;
+       const void * const *r;
        int i;
-       int (*comp_func)(const void *,const void *);
+
        if(st == NULL) return -1;
 
        if (st->comp == NULL)
@@ -227,17 +263,10 @@ static int internal_find(_STACK *st, void *data, int ret_val_options)
                }
        sk_sort(st);
        if (data == NULL) return(-1);
-       /* 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);
+       r=OBJ_bsearch_ex_(&data,st->data,st->num,sizeof(void *),st->comp,
+                         ret_val_options);
        if (r == NULL) return(-1);
-       return((int)(r-st->data));
+       return (int)((char **)r-st->data);
        }
 
 int sk_find(_STACK *st, void *data)