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 9d47c8fb8df886d400fe8d1254c708a4bc7d8968..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(const void *ca_void)
+static unsigned long add_hash(ADDED_OBJ *ca)
        {
-       const ASN1_OBJECT *a;
+       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(const void *ca_void)
        return(ret);
        }
 
-/* static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb) */
-static int add_cmp(const void *ca_void, const 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;
        }
@@ -224,7 +219,7 @@ int OBJ_new_nid(int num)
        return(i);
        }
 
-int OBJ_add_object(const ASN1_OBJECT *obj)
+int OBJ_add_object(ASN1_OBJECT *obj)
        {
        ASN1_OBJECT *o;
        ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
@@ -360,7 +355,7 @@ const char *OBJ_nid2ln(int n)
                }
        }
 
-int OBJ_obj2nid(const ASN1_OBJECT *a)
+int OBJ_obj2nid(ASN1_OBJECT *a)
        {
        ASN1_OBJECT **op;
        ADDED_OBJ ad,*adp;
@@ -373,7 +368,7 @@ int OBJ_obj2nid(const ASN1_OBJECT *a)
        if (added != NULL)
                {
                ad.type=ADDED_DATA;
-               ad.obj=(ASN1_OBJECT *)a; /* XXX: ugly but harmless */
+               ad.obj=a;
                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL) return (adp->obj->nid);
                }
@@ -427,7 +422,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
        return op;
        }
 
-int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
+int OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name)
 {
        int i,idx=0,n=0,len,nid;
        unsigned long l;
@@ -493,7 +488,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
        return(n);
 }
 
-int OBJ_txt2nid(const char *s)
+int OBJ_txt2nid(char *s)
 {
        ASN1_OBJECT *obj;
        int nid;
@@ -552,11 +547,10 @@ static int obj_cmp(const void *ap, const void *bp)
        return(memcmp(a->data,b->data,a->length));
         }
 
-const char *OBJ_bsearch(const char *key, const char *base, int num, int size,
-       int (*cmp)(const void *, const void *))
+char *OBJ_bsearch(char *key, char *base, int num, int size, int (*cmp)(const void *, const void *))
        {
        int l,h,i,c;
-       const char *p;
+       char *p;
 
        if (num == 0) return(NULL);
        l=0;
@@ -635,7 +629,7 @@ int OBJ_create_objects(BIO *in)
        /* return(num); */
        }
 
-int OBJ_create(const char *oid, const char *sn, const char *ln)
+int OBJ_create(char *oid, char *sn, char *ln)
        {
        int ok=0;
        ASN1_OBJECT *op=NULL;
@@ -651,6 +645,8 @@ int OBJ_create(const char *oid, const char *sn, const 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;