AFAICS lst1 stands for "lshift test" not "list".

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

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 0b24b144460f807d5942df6a620490c617c991ea..aa5c50e5cca2d9ba83d811ae92634522ff5ce958 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));
@@ -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;
@@ -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);
        }