This commit was generated by cvs2git to track changes on a CVS vendor

branch.

2 files changed, 427 insertions, 0 deletions

diff --git a/src/lib/libcrypto/stack/stack.c b/src/lib/libcrypto/stack/stack.c
new file mode 100644
index 0000000000..610ccbb756
--- /dev/null
+++ b/src/lib/libcrypto/stack/stack.c
@@ -0,0 +1,307 @@
+/* crypto/stack/stack.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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 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 acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS 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 AUTHOR OR 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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+/* Code for stacks
+ * Author - Eric Young v 1.0
+ * 1.2 eay 12-Mar-97 -  Modified sk_find so that it _DOES_ return the
+ *                      lowest index for the seached item.
+ *
+ * 1.1 eay - Take from netdb and added to SSLeay
+ *
+ * 1.0 eay - First version 29/07/92
+ */
+#include <stdio.h>
+#include "cryptlib.h"
+#include "stack.h"
+
+#undef MIN_NODES
+#define MIN_NODES       4
+
+char *STACK_version="STACK part of SSLeay 0.9.0b 29-Jun-1998";
+
+#ifndef NOPROTO
+#define FP_ICC  (int (*)(const void *,const void *))
+#else
+#define FP_ICC
+#endif
+
+#include <errno.h>
+
+void sk_set_cmp_func(sk,c)
+STACK *sk;
+int (*c)();
+        {
+        if (sk->comp != c)
+                sk->sorted=0;
+        sk->comp=c;
+        }
+
+STACK *sk_dup(sk)
+STACK *sk;
+        {
+        STACK *ret;
+        char **s;
+
+        if ((ret=sk_new(sk->comp)) == NULL) goto err;
+        s=(char **)Realloc((char *)ret->data,
+                (unsigned int)sizeof(char *)*sk->num_alloc);
+        if (s == NULL) goto err;
+        ret->data=s;
+
+        ret->num=sk->num;
+        memcpy(ret->data,sk->data,sizeof(char *)*sk->num);
+        ret->sorted=sk->sorted;
+        ret->num_alloc=sk->num_alloc;
+        ret->comp=sk->comp;
+        return(ret);
+err:
+        return(NULL);
+        }
+
+STACK *sk_new(c)
+int (*c)();
+        {
+        STACK *ret;
+        int i;
+
+        if ((ret=(STACK *)Malloc(sizeof(STACK))) == NULL)
+                goto err0;
+        if ((ret->data=(char **)Malloc(sizeof(char *)*MIN_NODES)) == NULL)
+                goto err1;
+        for (i=0; i<MIN_NODES; i++)
+                ret->data[i]=NULL;
+        ret->comp=c;
+        ret->num_alloc=MIN_NODES;
+        ret->num=0;
+        ret->sorted=0;
+        return(ret);
+err1:
+        Free((char *)ret);
+err0:
+        return(NULL);
+        }
+
+int sk_insert(st,data,loc)
+STACK *st;
+char *data;
+int loc;
+        {
+        char **s;
+
+        if (st->num_alloc <= st->num+1)
+                {
+                s=(char **)Realloc((char *)st->data,
+                        (unsigned int)sizeof(char *)*st->num_alloc*2);
+                if (s == NULL)
+                        return(0);
+                st->data=s;
+                st->num_alloc*=2;
+                }
+        if ((loc >= (int)st->num) || (loc < 0))
+                st->data[st->num]=data;
+        else
+                {
+                int i;
+                char **f,**t;
+
+                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( (char *)&(st->data[loc+1]),
+                        (char *)&(st->data[loc]),
+                        sizeof(char *)*(st->num-loc));
+#endif
+                st->data[loc]=data;
+                }
+        st->num++;
+        st->sorted=0;
+        return(st->num);
+        }
+
+char *sk_delete_ptr(st,p)
+STACK *st;
+char *p;
+        {
+        int i;
+
+        for (i=0; i<st->num; i++)
+                if (st->data[i] == p)
+                        return(sk_delete(st,i));
+        return(NULL);
+        }
+
+char *sk_delete(st,loc)
+STACK *st;
+int loc;
+        {
+        char *ret;
+        int i,j;
+
+        if ((st->num == 0) || (loc < 0) || (loc >= st->num)) return(NULL);
+
+        ret=st->data[loc];
+        if (loc != st->num-1)
+                {
+                j=st->num-1;
+                for (i=loc; i<j; i++)
+                        st->data[i]=st->data[i+1];
+                /* In theory memcpy is not safe for this
+                 * memcpy( &(st->data[loc]),
+                 *      &(st->data[loc+1]),
+                 *      sizeof(char *)*(st->num-loc-1));
+                 */
+                }
+        st->num--;
+        return(ret);
+        }
+
+int sk_find(st,data)
+STACK *st;
+char *data;
+        {
+        char **r;
+        int i;
+        int (*comp_func)();
+
+        if (st->comp == NULL)
+                {
+                for (i=0; i<st->num; i++)
+                        if (st->data[i] == data)
+                                return(i);
+                return(-1);
+                }
+        comp_func=(int (*)())st->comp;
+        if (!st->sorted)
+                {
+                qsort((char *)st->data,st->num,sizeof(char *),FP_ICC comp_func);
+                st->sorted=1;
+                }
+        if (data == NULL) return(-1);
+        r=(char **)bsearch(&data,(char *)st->data,
+                st->num,sizeof(char *),FP_ICC comp_func);
+        if (r == NULL) return(-1);
+        i=(int)(r-st->data);
+        for ( ; i>0; i--)
+                if ((*st->comp)(&(st->data[i-1]),&data) < 0)
+                        break;
+        return(i);
+        }
+
+int sk_push(st,data)
+STACK *st;
+char *data;
+        {
+        return(sk_insert(st,data,st->num));
+        }
+
+int sk_unshift(st,data)
+STACK *st;
+char *data;
+        {
+        return(sk_insert(st,data,0));
+        }
+
+char *sk_shift(st)
+STACK *st;
+        {
+        if (st == NULL) return(NULL);
+        if (st->num <= 0) return(NULL);
+        return(sk_delete(st,0));
+        }
+
+char *sk_pop(st)
+STACK *st;
+        {
+        if (st == NULL) return(NULL);
+        if (st->num <= 0) return(NULL);
+        return(sk_delete(st,st->num-1));
+        }
+
+void sk_zero(st)
+STACK *st;
+        {
+        if (st == NULL) return;
+        if (st->num <= 0) return;
+        memset((char *)st->data,0,sizeof(st->data)*st->num);
+        st->num=0;
+        }
+
+void sk_pop_free(st,func)
+STACK *st;
+void (*func)();
+        {
+        int i;
+
+        if (st == NULL) return;
+        for (i=0; i<st->num; i++)
+                if (st->data[i] != NULL)
+                        func(st->data[i]);
+        sk_free(st);
+        }
+
+void sk_free(st)
+STACK *st;
+        {
+        if (st == NULL) return;
+        if (st->data != NULL) Free((char *)st->data);
+        Free((char *)st);
+        }
+
diff --git a/src/lib/libcrypto/stack/stack.h b/src/lib/libcrypto/stack/stack.h
new file mode 100644
index 0000000000..615eb6ff94
--- /dev/null
+++ b/src/lib/libcrypto/stack/stack.h
@@ -0,0 +1,120 @@
+/* crypto/stack/stack.h */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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 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 acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS 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 AUTHOR OR 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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef HEADER_STACK_H
+#define HEADER_STACK_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+typedef struct stack_st
+        {
+        int num;
+        char **data;
+        int sorted;
+
+        int num_alloc;
+        int (*comp)();
+        } STACK;
+
+#define sk_num(sk)              ((sk)->num)
+#define sk_value(sk,n)          ((sk)->data[n])
+
+#define sk_new_null()   sk_new(NULL)
+#ifndef NOPROTO
+
+STACK *sk_new(int (*cmp)());
+void sk_free(STACK *);
+void sk_pop_free(STACK *st, void (*func)());
+int sk_insert(STACK *sk,char *data,int where);
+char *sk_delete(STACK *st,int loc);
+char *sk_delete_ptr(STACK *st, char *p);
+int sk_find(STACK *st,char *data);
+int sk_push(STACK *st,char *data);
+int sk_unshift(STACK *st,char *data);
+char *sk_shift(STACK *st);
+char *sk_pop(STACK *st);
+void sk_zero(STACK *st);
+void sk_set_cmp_func(STACK *sk, int (*c)());
+STACK *sk_dup(STACK *st);
+
+#else
+
+STACK *sk_new();
+void sk_free();
+void sk_pop_free();
+int sk_insert();
+char *sk_delete();
+char *sk_delete_ptr();
+int sk_find();
+int sk_push();
+int sk_unshift();
+char *sk_shift();
+char *sk_pop();
+void sk_zero();
+void sk_set_cmp_func();
+STACK *sk_dup();
+
+#endif
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif