Move the SCT List extension parser into libssl.

[openssl.git] / crypto / objects / o_names.c

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 2b80243256d96e00e174f05efb31fd7f88624cf9..4a548c2ed497581114210051090aa48e07197ad9 100644 (file)
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <openssl/err.h>
 #include <openssl/lhash.h>
 #include <openssl/objects.h>
 #include <openssl/safestack.h>
@@ -21,7 +22,8 @@
 /* I use the ex_data stuff to manage the identifiers for the obj_name_types
  * that applications may define.  I only really use the free function field.
  */
-static LHASH *names_lh=NULL;
+DECLARE_LHASH_OF(OBJ_NAME);
+static LHASH_OF(OBJ_NAME) *names_lh=NULL;
 static int names_type_num=OBJ_NAME_TYPE_NUM;
 
 typedef struct name_funcs_st
@@ -45,11 +47,14 @@ static unsigned long obj_name_hash(const void *a_void);
 /* static int obj_name_cmp(OBJ_NAME *a,OBJ_NAME *b); */
 static int obj_name_cmp(const void *a_void,const void *b_void);
 
+static IMPLEMENT_LHASH_HASH_FN(obj_name, OBJ_NAME)
+static IMPLEMENT_LHASH_COMP_FN(obj_name, OBJ_NAME)
+
 int OBJ_NAME_init(void)
        {
        if (names_lh != NULL) return(1);
        MemCheck_off();
-       names_lh=lh_new(obj_name_hash, obj_name_cmp);
+       names_lh=lh_OBJ_NAME_new();
        MemCheck_on();
        return(names_lh != NULL);
        }
@@ -68,7 +73,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
                name_funcs_stack=sk_NAME_FUNCS_new_null();
                MemCheck_on();
                }
-       if ((name_funcs_stack == NULL))
+       if (name_funcs_stack == NULL)
                {
                /* ERROR */
                return(0);
@@ -79,6 +84,12 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
                {
                MemCheck_off();
                name_funcs = OPENSSL_malloc(sizeof(NAME_FUNCS));
+               MemCheck_on();
+               if (!name_funcs)
+                       {
+                       OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX,ERR_R_MALLOC_FAILURE);
+                       return(0);
+                       }
                name_funcs->hash_func = lh_strhash;
                name_funcs->cmp_func = OPENSSL_strcmp;
                name_funcs->free_func = 0; /* NULL is often declared to
@@ -86,6 +97,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
                                                * to Compaq C is not really
                                                * compatible with a function
                                                * pointer.      -- Richard Levitte*/
+               MemCheck_off();
                sk_NAME_FUNCS_push(name_funcs_stack,name_funcs);
                MemCheck_on();
                }
@@ -103,8 +115,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
 static int obj_name_cmp(const void *a_void, const void *b_void)
        {
        int ret;
-       OBJ_NAME *a = (OBJ_NAME *)a_void;
-       OBJ_NAME *b = (OBJ_NAME *)b_void;
+       const OBJ_NAME *a = (const OBJ_NAME *)a_void;
+       const OBJ_NAME *b = (const OBJ_NAME *)b_void;
 
        ret=a->type-b->type;
        if (ret == 0)
@@ -125,7 +137,7 @@ static int obj_name_cmp(const void *a_void, const void *b_void)
 static unsigned long obj_name_hash(const void *a_void)
        {
        unsigned long ret;
-       OBJ_NAME *a = (OBJ_NAME *)a_void;
+       const OBJ_NAME *a = (const OBJ_NAME *)a_void;
 
        if ((name_funcs_stack != NULL) && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type))
                {
@@ -156,7 +168,7 @@ const char *OBJ_NAME_get(const char *name, int type)
 
        for (;;)
        {
-               ret=(OBJ_NAME *)lh_retrieve(names_lh,&on);
+               ret=lh_OBJ_NAME_retrieve(names_lh,&on);
                if (ret == NULL) return(NULL);
                if ((ret->alias) && !alias)
                        {
@@ -192,7 +204,7 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
        onp->type=type;
        onp->data=data;
 
-       ret=(OBJ_NAME *)lh_insert(names_lh,onp);
+       ret=lh_OBJ_NAME_insert(names_lh,onp);
        if (ret != NULL)
                {
                /* free things */
@@ -209,7 +221,7 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
                }
        else
                {
-               if (lh_error(names_lh))
+               if (lh_OBJ_NAME_error(names_lh))
                        {
                        /* ERROR */
                        return(0);
@@ -227,7 +239,7 @@ int OBJ_NAME_remove(const char *name, int type)
        type&= ~OBJ_NAME_ALIAS;
        on.name=name;
        on.type=type;
-       ret=(OBJ_NAME *)lh_delete(names_lh,&on);
+       ret=lh_OBJ_NAME_delete(names_lh,&on);
        if (ret != NULL)
                {
                /* free things */
@@ -254,13 +266,13 @@ struct doall
        void *arg;
        };
 
-static void do_all_fn(const OBJ_NAME *name,struct doall *d)
+static void do_all_fn_doall_arg(const OBJ_NAME *name,struct doall *d)
        {
        if(name->type == d->type)
                d->fn(name,d->arg);
        }
 
-static IMPLEMENT_LHASH_DOALL_ARG_FN(do_all_fn, const OBJ_NAME *, struct doall *)
+static IMPLEMENT_LHASH_DOALL_ARG_FN(do_all_fn, const OBJ_NAME, struct doall)
 
 void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),void *arg)
        {
@@ -270,7 +282,8 @@ void OBJ_NAME_do_all(int type,void (*fn)(const OBJ_NAME *,void *arg),void *arg)
        d.fn=fn;
        d.arg=arg;
 
-       lh_doall_arg(names_lh,LHASH_DOALL_ARG_FN(do_all_fn),&d);
+       lh_OBJ_NAME_doall_arg(names_lh, LHASH_DOALL_ARG_FN(do_all_fn),
+                             struct doall, &d);
        }
 
 struct doall_sorted
@@ -305,7 +318,7 @@ void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
        int n;
 
        d.type=type;
-       d.names=OPENSSL_malloc(lh_num_items(names_lh)*sizeof *d.names);
+       d.names=OPENSSL_malloc(lh_OBJ_NAME_num_items(names_lh)*sizeof *d.names);
        d.n=0;
        OBJ_NAME_do_all(type,do_all_sorted_fn,&d);
 
@@ -319,18 +332,16 @@ void OBJ_NAME_do_all_sorted(int type,void (*fn)(const OBJ_NAME *,void *arg),
 
 static int free_type;
 
-static void names_lh_free(OBJ_NAME *onp)
-{
-       if(onp == NULL)
+static void names_lh_free_doall(OBJ_NAME *onp)
+       {
+       if (onp == NULL)
                return;
 
-       if ((free_type < 0) || (free_type == onp->type))
-               {
+       if (free_type < 0 || free_type == onp->type)
                OBJ_NAME_remove(onp->name,onp->type);
-               }
        }
 
-static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME *)
+static IMPLEMENT_LHASH_DOALL_FN(names_lh_free, OBJ_NAME)
 
 static void name_funcs_free(NAME_FUNCS *ptr)
        {
@@ -344,18 +355,18 @@ void OBJ_NAME_cleanup(int type)
        if (names_lh == NULL) return;
 
        free_type=type;
-       down_load=names_lh->down_load;
-       names_lh->down_load=0;
+       down_load=lh_OBJ_NAME_down_load(names_lh);
+       lh_OBJ_NAME_down_load(names_lh)=0;
 
-       lh_doall(names_lh,LHASH_DOALL_FN(names_lh_free));
+       lh_OBJ_NAME_doall(names_lh,LHASH_DOALL_FN(names_lh_free));
        if (type < 0)
                {
-               lh_free(names_lh);
+               lh_OBJ_NAME_free(names_lh);
                sk_NAME_FUNCS_pop_free(name_funcs_stack,name_funcs_free);
                names_lh=NULL;
                name_funcs_stack = NULL;
                }
        else
-               names_lh->down_load=down_load;
+               lh_OBJ_NAME_down_load(names_lh)=down_load;
        }