synchronize with engine branch (some changes were done only

[oweals/openssl.git] / crypto / objects / obj_dat.c

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 0057da29bd52654f5bafcf4851aaaa5418e7c903..4d82378b9db1cc091556c1e4f3c47a0f03e0bb9c 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -108,14 +108,12 @@ static int ln_cmp(const void *a, const void *b)
        return(strcmp((*ap)->ln,(*bp)->ln));
        }
 
-/* static unsigned long add_hash(ADDED_OBJ *ca) */
-static unsigned long add_hash(void *ca_void)
+static unsigned long add_hash(ADDED_OBJ *ca)
        {
        ASN1_OBJECT *a;
        int i;
        unsigned long ret=0;
        unsigned char *p;
-       ADDED_OBJ *ca = (ADDED_OBJ *)ca_void;
 
        a=ca->obj;
        switch (ca->type)
@@ -144,13 +142,10 @@ static unsigned long add_hash(void *ca_void)
        return(ret);
        }
 
-/* static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb) */
-static int add_cmp(void *ca_void, void *cb_void)
+static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb)
        {
        ASN1_OBJECT *a,*b;
        int i;
-       ADDED_OBJ *ca = (ADDED_OBJ *)ca_void;
-       ADDED_OBJ *cb = (ADDED_OBJ *)cb_void;
 
        i=ca->type-cb->type;
        if (i) return(i);
@@ -208,9 +203,9 @@ void OBJ_cleanup(void)
        {
        if (added == NULL) return;
        added->down_load=0;
-       lh_doall(added,(LHASH_DOALL_FN_TYPE)cleanup1); /* zero counters */
-       lh_doall(added,(LHASH_DOALL_FN_TYPE)cleanup2); /* set counters */
-       lh_doall(added,(LHASH_DOALL_FN_TYPE)cleanup3); /* free objects */
+       lh_doall(added,cleanup1); /* zero counters */
+       lh_doall(added,cleanup2); /* set counters */
+       lh_doall(added,cleanup3); /* free objects */
        lh_free(added);
        added=NULL;
        }
@@ -650,6 +645,8 @@ int OBJ_create(char *oid, char *sn, char *ln)
                return(0);
                }
        i=a2d_ASN1_OBJECT(buf,i,oid,-1);
+       if (i == 0)
+               goto err;
        op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
        if (op == NULL) 
                goto err;