Use public domain snprintf() implementation by Patrick Powell to avoid

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

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index cfc082add33ef0f1f422376aef3a4467ddb400a5..da6df3762ad56e2a91b4a053a1f81dfde7654b32 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -214,16 +214,12 @@ int OBJ_new_nid(int num)
 int OBJ_add_object(ASN1_OBJECT *obj)
        {
        ASN1_OBJECT *o;
-       ADDED_OBJ *ao[4],*aop;
+       ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;
        int i;
 
        if (added == NULL)
                if (!init_added()) return(0);
        if ((o=OBJ_dup(obj)) == NULL) goto err;
-       ao[ADDED_DATA]=NULL;
-       ao[ADDED_SNAME]=NULL;
-       ao[ADDED_LNAME]=NULL;
-       ao[ADDED_NID]=NULL;
        ao[ADDED_NID]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
        if ((o->length != 0) && (obj->data != NULL))
                ao[ADDED_DATA]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));
@@ -238,7 +234,7 @@ int OBJ_add_object(ASN1_OBJECT *obj)
                        {
                        ao[i]->type=i;
                        ao[i]->obj=o;
-                       aop=(ADDED_OBJ *)lh_insert(added,(char *)ao[i]);
+                       aop=(ADDED_OBJ *)lh_insert(added,ao[i]);
                        /* memory leak, buit should not normally matter */
                        if (aop != NULL)
                                Free(aop);
@@ -276,7 +272,7 @@ ASN1_OBJECT *OBJ_nid2obj(int n)
                ad.type=ADDED_NID;
                ad.obj= &ob;
                ob.nid=n;
-               adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+               adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL)
                        return(adp->obj);
                else
@@ -308,7 +304,7 @@ const char *OBJ_nid2sn(int n)
                ad.type=ADDED_NID;
                ad.obj= &ob;
                ob.nid=n;
-               adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+               adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL)
                        return(adp->obj->sn);
                else
@@ -340,7 +336,7 @@ const char *OBJ_nid2ln(int n)
                ad.type=ADDED_NID;
                ad.obj= &ob;
                ob.nid=n;
-               adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+               adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL)
                        return(adp->obj->ln);
                else
@@ -365,7 +361,7 @@ int OBJ_obj2nid(ASN1_OBJECT *a)
                {
                ad.type=ADDED_DATA;
                ad.obj=a;
-               adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+               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,
@@ -418,6 +414,72 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
        return op;
        }
 
+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;
+       unsigned char *p;
+       const char *s;
+       char tbuf[32];
+
+       if (buf_len <= 0) return(0);
+
+       if ((a == NULL) || (a->data == NULL)) {
+               buf[0]='\0';
+               return(0);
+       }
+
+       nid=OBJ_obj2nid(a);
+       if ((nid == NID_undef) || no_name) {
+               len=a->length;
+               p=a->data;
+
+               idx=0;
+               l=0;
+               while (idx < a->length) {
+                       l|=(p[idx]&0x7f);
+                       if (!(p[idx] & 0x80)) break;
+                       l<<=7L;
+                       idx++;
+               }
+               idx++;
+               i=(int)(l/40);
+               if (i > 2) i=2;
+               l-=(long)(i*40);
+
+               sprintf(tbuf,"%d.%lu",i,l);
+               i=strlen(tbuf);
+               strncpy(buf,tbuf,buf_len);
+               buf_len-=i;
+               buf+=i;
+               n+=i;
+
+               l=0;
+               for (; idx<len; idx++) {
+                       l|=p[idx]&0x7f;
+                       if (!(p[idx] & 0x80)) {
+                               sprintf(tbuf,".%lu",l);
+                               i=strlen(tbuf);
+                               if (buf_len > 0)
+                                       strncpy(buf,tbuf,buf_len);
+                               buf_len-=i;
+                               buf+=i;
+                               n+=i;
+                               l=0;
+                       }
+                       l<<=7L;
+               }
+       } else {
+               s=OBJ_nid2ln(nid);
+               if (s == NULL)
+                       s=OBJ_nid2sn(nid);
+               strncpy(buf,s,buf_len);
+               n=strlen(s);
+       }
+       buf[buf_len-1]='\0';
+       return(n);
+}
+
 int OBJ_txt2nid(char *s)
 {
        ASN1_OBJECT *obj;
@@ -438,7 +500,7 @@ int OBJ_ln2nid(const char *s)
                {
                ad.type=ADDED_LNAME;
                ad.obj= &o;
-               adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+               adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL) return (adp->obj->nid);
                }
        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)ln_objs,NUM_LN,
@@ -457,7 +519,7 @@ int OBJ_sn2nid(const char *s)
                {
                ad.type=ADDED_SNAME;
                ad.obj= &o;
-               adp=(ADDED_OBJ *)lh_retrieve(added,(char *)&ad);
+               adp=(ADDED_OBJ *)lh_retrieve(added,&ad);
                if (adp != NULL) return (adp->obj->nid);
                }
        op=(ASN1_OBJECT **)OBJ_bsearch((char *)&oo,(char *)sn_objs,NUM_SN,
@@ -497,6 +559,17 @@ char *OBJ_bsearch(char *key, char *base, int num, int size, int (*cmp)())
                else
                        return(p);
                }
+#ifdef CHARSET_EBCDIC
+/* THIS IS A KLUDGE - Because the *_obj is sorted in ASCII order, and
+ * I don't have perl (yet), we revert to a *LINEAR* search
+ * when the object wasn't found in the binary search.
+ */
+       for (i=0; i<num; ++i) {
+               p= &(base[i*size]);
+               if ((*cmp)(key,p) == 0)
+                       return p;
+       }
+#endif
        return(NULL);
        }
 
@@ -512,26 +585,26 @@ int OBJ_create_objects(BIO *in)
                i=BIO_gets(in,buf,512);
                if (i <= 0) return(num);
                buf[i-1]='\0';
-               if (!isalnum(buf[0])) return(num);
+               if (!isalnum((unsigned char)buf[0])) return(num);
                o=s=buf;
-               while (isdigit(*s) || (*s == '.'))
+               while (isdigit((unsigned char)*s) || (*s == '.'))
                        s++;
                if (*s != '\0')
                        {
                        *(s++)='\0';
-                       while (isspace(*s))
+                       while (isspace((unsigned char)*s))
                                s++;
                        if (*s == '\0')
                                s=NULL;
                        else
                                {
                                l=s;
-                               while ((*l != '\0') && !isspace(*l))
+                               while ((*l != '\0') && !isspace((unsigned char)*l))
                                        l++;
                                if (*l != '\0')
                                        {
                                        *(l++)='\0';
-                                       while (isspace(*l))
+                                       while (isspace((unsigned char)*l))
                                                l++;
                                        if (*l == '\0') l=NULL;
                                        }
@@ -570,7 +643,7 @@ int OBJ_create(char *oid, char *sn, char *ln)
        ok=OBJ_add_object(op);
 err:
        ASN1_OBJECT_free(op);
-       Free((char *)buf);
+       Free(buf);
        return(ok);
        }