projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove unnecessary calls to EC_POINT_copy()
[openssl.git] / crypto / objects / obj_dat.c
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index da6df3762ad56e2a91b4a053a1f81dfde7654b32..3ff64bb8d13ffda597929f1cea53c2fcea947220 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -64,7 +64,7 @@
 #include <openssl/objects.h>
 
 /* obj_dat.h is generated from objects.h by obj_dat.pl */
-#ifndef NO_OBJECT
+#ifndef OPENSSL_NO_OBJECT
 #include "obj_dat.h"
 #else
 /* You will have to load all the objects needed manually in the application */
@@ -79,9 +79,9 @@ static ASN1_OBJECT *ln_objs[1];
 static ASN1_OBJECT *obj_objs[1];
 #endif
 
-static int sn_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
-static int ln_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
-static int obj_cmp(ASN1_OBJECT **a, ASN1_OBJECT **b);
+static int sn_cmp(const void *a, const void *b);
+static int ln_cmp(const void *a, const void *b);
+static int obj_cmp(const void *a, const void *b);
 #define ADDED_DATA     0
 #define ADDED_SNAME    1
 #define ADDED_LNAME    2
@@ -96,18 +96,26 @@ typedef struct added_obj_st
 static int new_nid=NUM_NID;
 static LHASH *added=NULL;
 
-static int sn_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp)
-       { return(strcmp((*ap)->sn,(*bp)->sn)); }
+static int sn_cmp(const void *a, const void *b)
+       {
+       const ASN1_OBJECT * const *ap = a, * const *bp = b;
+       return(strcmp((*ap)->sn,(*bp)->sn));
+       }
 
-static int ln_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp)
-       { return(strcmp((*ap)->ln,(*bp)->ln)); }
+static int ln_cmp(const void *a, const void *b)
+       { 
+       const ASN1_OBJECT * const *ap = a, * const *bp = b;
+       return(strcmp((*ap)->ln,(*bp)->ln));
+       }
 
-static unsigned long add_hash(ADDED_OBJ *ca)
+/* static unsigned long add_hash(ADDED_OBJ *ca) */
+static unsigned long add_hash(const void *ca_void)
        {
-       ASN1_OBJECT *a;
+       const 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)
@@ -128,17 +136,21 @@ static unsigned long add_hash(ADDED_OBJ *ca)
                ret=a->nid;
                break;
        default:
-               abort();
+               /* abort(); */
+               return 0;
                }
        ret&=0x3fffffffL;
        ret|=ca->type<<30L;
        return(ret);
        }
 
-static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb)
+/* static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb) */
+static int add_cmp(const void *ca_void, const void *cb_void)
        {
        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);
@@ -161,9 +173,9 @@ static int add_cmp(ADDED_OBJ *ca, ADDED_OBJ *cb)
        case ADDED_NID:
                return(a->nid-b->nid);
        default:
-               abort();
+               /* abort(); */
+               return 0;
                }
-       return(1); /* should not get here */
        }
 
 static int init_added(void)
@@ -188,16 +200,20 @@ static void cleanup3(ADDED_OBJ *a)
        {
        if (--a->obj->nid == 0)
                ASN1_OBJECT_free(a->obj);
-       Free(a);
+       OPENSSL_free(a);
        }
 
+static IMPLEMENT_LHASH_DOALL_FN(cleanup1, ADDED_OBJ *)
+static IMPLEMENT_LHASH_DOALL_FN(cleanup2, ADDED_OBJ *)
+static IMPLEMENT_LHASH_DOALL_FN(cleanup3, ADDED_OBJ *)
+
 void OBJ_cleanup(void)
        {
        if (added == NULL) return;
        added->down_load=0;
-       lh_doall(added,cleanup1); /* zero counters */
-       lh_doall(added,cleanup2); /* set counters */
-       lh_doall(added,cleanup3); /* free objects */
+       lh_doall(added,LHASH_DOALL_FN(cleanup1)); /* zero counters */
+       lh_doall(added,LHASH_DOALL_FN(cleanup2)); /* set counters */
+       lh_doall(added,LHASH_DOALL_FN(cleanup3)); /* free objects */
        lh_free(added);
        added=NULL;
        }
@@ -211,7 +227,7 @@ int OBJ_new_nid(int num)
        return(i);
        }
 
-int OBJ_add_object(ASN1_OBJECT *obj)
+int OBJ_add_object(const ASN1_OBJECT *obj)
        {
        ASN1_OBJECT *o;
        ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
@@ -220,13 +236,13 @@ int OBJ_add_object(ASN1_OBJECT *obj)
        if (added == NULL)
                if (!init_added()) return(0);
        if ((o=OBJ_dup(obj)) == NULL) goto err;
-       ao[ADDED_NID]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
+       if (!(ao[ADDED_NID]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ)))) goto err;
        if ((o->length != 0) && (obj->data != NULL))
-               ao[ADDED_DATA]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
+               ao[ADDED_DATA]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
        if (o->sn != NULL)
-               ao[ADDED_SNAME]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
+               ao[ADDED_SNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
        if (o->ln != NULL)
-               ao[ADDED_LNAME]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
+               ao[ADDED_LNAME]=(ADDED_OBJ *)OPENSSL_malloc(sizeof(ADDED_OBJ));
 
        for (i=ADDED_DATA; i<=ADDED_NID; i++)
                {
@@ -237,7 +253,7 @@ int OBJ_add_object(ASN1_OBJECT *obj)
                        aop=(ADDED_OBJ *)lh_insert(added,ao[i]);
                        /* memory leak, buit should not normally matter */
                        if (aop != NULL)
-                               Free(aop);
+                               OPENSSL_free(aop);
                        }
                }
        o->flags&= ~(ASN1_OBJECT_FLAG_DYNAMIC|ASN1_OBJECT_FLAG_DYNAMIC_STRINGS|
@@ -246,8 +262,8 @@ int OBJ_add_object(ASN1_OBJECT *obj)
        return(o->nid);
 err:
        for (i=ADDED_DATA; i<=ADDED_NID; i++)
-               if (ao[i] != NULL) Free(ao[i]);
-       if (o != NULL) Free(o);
+               if (ao[i] != NULL) OPENSSL_free(ao[i]);
+       if (o != NULL) OPENSSL_free(o);
        return(NID_undef);
        }
 
@@ -347,7 +363,7 @@ const char *OBJ_nid2ln(int n)
                }
        }
 
-int OBJ_obj2nid(ASN1_OBJECT *a)
+int OBJ_obj2nid(const ASN1_OBJECT *a)
        {
        ASN1_OBJECT **op;
        ADDED_OBJ ad,*adp;
@@ -360,12 +376,12 @@ int OBJ_obj2nid(ASN1_OBJECT *a)
        if (added != NULL)
                {
                ad.type=ADDED_DATA;
-               ad.obj=a;
+               ad.obj=(ASN1_OBJECT *)a; /* XXX: ugly but harmless */
                adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL) return (adp->obj->nid);
                }
        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&a,(char *)obj_objs,NUM_OBJ,
-               sizeof(ASN1_OBJECT *),(int (*)())obj_cmp);
+               sizeof(ASN1_OBJECT *),obj_cmp);
        if (op == NULL)
                return(NID_undef);
        return((*op)->nid);
@@ -400,7 +416,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
        /* Work out total size */
        j = ASN1_object_size(0,i,V_ASN1_OBJECT);
 
-       if((buf=(unsigned char *)Malloc(j)) == NULL) return NULL;
+       if((buf=(unsigned char *)OPENSSL_malloc(j)) == NULL) return NULL;
 
        p = buf;
        /* Write out tag+length */
@@ -410,11 +426,11 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
        
        p=buf;
        op=d2i_ASN1_OBJECT(NULL,&p,i);
-       Free(buf);
+       OPENSSL_free(buf);
        return op;
        }
 
-int OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name)
+int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 {
        int i,idx=0,n=0,len,nid;
        unsigned long l;
@@ -429,8 +445,7 @@ int OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name)
                return(0);
        }
 
-       nid=OBJ_obj2nid(a);
-       if ((nid == NID_undef) || no_name) {
+       if (no_name || (nid=OBJ_obj2nid(a)) == NID_undef) {
                len=a->length;
                p=a->data;
 
@@ -480,7 +495,7 @@ int OBJ_obj2txt(char *buf, int buf_len, ASN1_OBJECT *a, int no_name)
        return(n);
 }
 
-int OBJ_txt2nid(char *s)
+int OBJ_txt2nid(const char *s)
 {
        ASN1_OBJECT *obj;
        int nid;
@@ -504,7 +519,7 @@ int OBJ_ln2nid(const char *s)
                if (adp != NULL) return (adp->obj->nid);
                }
        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN,
-               sizeof(ASN1_OBJECT *),(int (*)())ln_cmp);
+               sizeof(ASN1_OBJECT *),ln_cmp);
        if (op == NULL) return(NID_undef);
        return((*op)->nid);
        }
@@ -523,26 +538,27 @@ int OBJ_sn2nid(const char *s)
                if (adp != NULL) return (adp->obj->nid);
                }
        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)sn_objs,NUM_SN,
-               sizeof(ASN1_OBJECT *),(int (*)())sn_cmp);
+               sizeof(ASN1_OBJECT *),sn_cmp);
        if (op == NULL) return(NID_undef);
        return((*op)->nid);
        }
 
-static int obj_cmp(ASN1_OBJECT **ap, ASN1_OBJECT **bp)
+static int obj_cmp(const void *ap, const void *bp)
        {
        int j;
-       ASN1_OBJECT *a= *ap;
-       ASN1_OBJECT *b= *bp;
+       ASN1_OBJECT *a= *(ASN1_OBJECT **)ap;
+       ASN1_OBJECT *b= *(ASN1_OBJECT **)bp;
 
        j=(a->length - b->length);
         if (j) return(j);
        return(memcmp(a->data,b->data,a->length));
         }
 
-char *OBJ_bsearch(char *key, char *base, int num, int size, int (*cmp)())
+const char *OBJ_bsearch(const char *key, const char *base, int num, int size,
+       int (*cmp)(const void *, const void *))
        {
        int l,h,i,c;
-       char *p;
+       const char *p;
 
        if (num == 0) return(NULL);
        l=0;
@@ -621,7 +637,7 @@ int OBJ_create_objects(BIO *in)
        /* return(num); */
        }
 
-int OBJ_create(char *oid, char *sn, char *ln)
+int OBJ_create(const char *oid, const char *sn, const char *ln)
        {
        int ok=0;
        ASN1_OBJECT *op=NULL;
@@ -631,19 +647,21 @@ int OBJ_create(char *oid, char *sn, char *ln)
        i=a2d_ASN1_OBJECT(NULL,0,oid,-1);
        if (i <= 0) return(0);
 
-       if ((buf=(unsigned char *)Malloc(i)) == NULL)
+       if ((buf=(unsigned char *)OPENSSL_malloc(i)) == NULL)
                {
                OBJerr(OBJ_F_OBJ_CREATE,OBJ_R_MALLOC_FAILURE);
                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;
        ok=OBJ_add_object(op);
 err:
        ASN1_OBJECT_free(op);
-       Free(buf);
+       OPENSSL_free(buf);
        return(ok);
        }
 
Unnamed repository; edit this file 'description' to name the repository.