Fix for d2i_ASN1_bytes and stop PKCS#7 routines crashing is signed message

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

diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 9f9b2f04f25b0a240b9a03bf134551824221775d..b94b418ee89a8f1ff424134fe022bccaad3867e3 100644 (file)
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -62,11 +62,6 @@
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 
-/* 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_I2T_ASN1_OBJECT,ASN1_R_BAD_OBJECT_HEADER);
- */
-
 int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
        {
        unsigned char *p;
@@ -176,77 +171,9 @@ err:
        }
 
 int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a)
-       {
-       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)
-               {
-               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.%ld",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,".%ld",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);
-       }
+{
+       return OBJ_obj2txt(buf, buf_len, a, 0);
+}
 
 int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
        {
@@ -373,3 +300,5 @@ ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
        return(OBJ_dup(&o));
        }
 
+IMPLEMENT_STACK_OF(ASN1_OBJECT)
+IMPLEMENT_ASN1_SET_OF(ASN1_OBJECT)