Import of old SSLeay release: SSLeay 0.9.0b

[openssl.git] / crypto / asn1 / a_object.c

diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 897915cf491acb4e747b4aab96a504be252542de..5a7eeef8d8b08b8620a87392f84268fd00e66d90 100644 (file)
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/a_object.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -64,7 +64,7 @@
 
 /* ASN1err(ASN1_F_ASN1_OBJECT_NEW,ASN1_R_EXPECTING_AN_OBJECT); 
  * ASN1err(ASN1_F_D2I_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER); 
- * ASN1err(ASN1_F_I2A_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER);
+ * ASN1err(ASN1_F_I2T_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER);
  */
 
 int i2d_ASN1_OBJECT(a, pp)
@@ -180,19 +180,23 @@ err:
        return(0);
        }
 
-int i2a_ASN1_OBJECT(bp,a)
-BIO *bp;
+int i2t_ASN1_OBJECT(buf,buf_len,a)
+char *buf;
+int buf_len;
 ASN1_OBJECT *a;
        {
-       int j,i,idx=0,n=0,len,nid,reason=ERR_R_BUF_LIB;
+       int i,idx=0,n=0,len,nid;
        unsigned long l;
        unsigned char *p;
-       char buf[20];
        char *s;
+       char tbuf[32];
+
+       if (buf_len <= 0) return(0);
 
        if ((a == NULL) || (a->data == NULL))
                {
-               return(BIO_write(bp,"NULL",4));
+               buf[0]='\0';
+               return(0);
                }
 
        nid=OBJ_obj2nid(a);
@@ -215,10 +219,11 @@ ASN1_OBJECT *a;
                if (i > 2) i=2;
                l-=(long)(i*40);
 
-               sprintf(buf,"%d.%ld",i,l);
-               i=strlen(buf);
-               if (BIO_write(bp,buf,i) != i)
-                               goto err;
+               sprintf(tbuf,"%d.%ld",i,l);
+               i=strlen(tbuf);
+               strncpy(buf,tbuf,buf_len);
+               buf_len-=i;
+               buf+=i;
                n+=i;
 
                l=0;
@@ -227,9 +232,12 @@ ASN1_OBJECT *a;
                        l|=p[idx]&0x7f;
                        if (!(p[idx] & 0x80))
                                {
-                               sprintf(buf,".%ld",l);
-                               i=strlen(buf);
-                               if (BIO_write(bp,buf,i) != i) goto err;
+                               sprintf(tbuf,".%ld",l);
+                               i=strlen(tbuf);
+                               if (buf_len > 0)
+                                       strncpy(buf,tbuf,buf_len);
+                               buf_len-=i;
+                               buf+=i;
                                n+=i;
                                l=0;
                                }
@@ -241,14 +249,26 @@ ASN1_OBJECT *a;
                s=(char *)OBJ_nid2ln(nid);
                if (s == NULL)
                        s=(char *)OBJ_nid2sn(nid);
-               j=strlen(s);
-               if (BIO_write(bp,s,j) != j) goto err;
-               n=j;
+               strncpy(buf,s,buf_len);
+               n=strlen(s);
                }
+       buf[buf_len-1]='\0';
        return(n);
-err:
-       ASN1err(ASN1_F_I2A_ASN1_OBJECT,reason);
-       return(-1);
+       }
+
+int i2a_ASN1_OBJECT(bp,a)
+BIO *bp;
+ASN1_OBJECT *a;
+       {
+       char buf[80];
+       int i;
+
+       if ((a == NULL) || (a->data == NULL))
+               return(BIO_write(bp,"NULL",4));
+       i=i2t_ASN1_OBJECT(buf,80,a);
+       if (i > 80) i=80;
+       BIO_write(bp,buf,i);
+       return(i);
        }
 
 ASN1_OBJECT *d2i_ASN1_OBJECT(a, pp, length)