Remove some references which called malloc and free instead of Malloc and Free.

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

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index ff30b25836ee4911caf74e4062467e44560c93ec..9c0080e3bfd491a97154ec5306ca8bcfab471ea2 100644 (file)
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -69,7 +69,7 @@ static int asn1_get_length();
 static void asn1_put_length();
 #endif
 
-char *ASN1_version="ASN1 part of SSLeay 0.9.0b 29-Jun-1998";
+char *ASN1_version="ASN.1 part of OpenSSL 0.9.2 31-Dec-1998";
 
 int ASN1_check_infinite_end(p,len)
 unsigned char **p;
@@ -130,11 +130,13 @@ long omax;
        *pclass=xclass;
        if (!asn1_get_length(&p,&inf,plength,(int)max)) goto err;
 
-#ifdef undef
-       fprintf(stderr,"p=%d + *plength=%d > omax=%d + *pp=%d  (%d > %d)\n", 
-               p,*plength,omax,*pp,(p+ *plength),omax+ *pp);
+#if 0
+       fprintf(stderr,"p=%d + *plength=%ld > omax=%ld + *pp=%d  (%d > %d)\n", 
+               (int)p,*plength,omax,(int)*pp,(int)(p+ *plength),
+               (int)(omax+ *pp));
 
 #endif
+#if 0
        if ((p+ *plength) > (omax+ *pp))
                {
                ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG);
@@ -142,8 +144,9 @@ long omax;
                 * the values are set correctly */
                ret|=0x80;
                }
+#endif
        *pp=p;
-       return(ret+inf);
+       return(ret|inf);
 err:
        ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_HEADER_TOO_LONG);
        return(0x80);
@@ -284,14 +287,14 @@ ASN1_CTX *c;
                {
                if (!ASN1_check_infinite_end(&c->p,c->slen))
                        {
-                       c->error=ASN1_R_MISSING_EOS;
+                       c->error=ERR_R_MISSING_ASN1_EOS;
                        return(0);
                        }
                }
        if (    ((c->slen != 0) && !(c->inf & 1)) ||
                ((c->slen < 0) && (c->inf & 1)))
                {
-               c->error=ASN1_R_LENGTH_MISMATCH;
+               c->error=ERR_R_ASN1_LENGTH_MISMATCH;
                return(0);
                }
        return(1);
@@ -308,18 +311,18 @@ long *length;
                *length);
        if (c->inf & 0x80)
                {
-               c->error=ASN1_R_BAD_GET_OBJECT;
+               c->error=ERR_R_BAD_GET_ASN1_OBJECT_CALL;
                return(0);
                }
        if (c->tag != V_ASN1_SEQUENCE)
                {
-               c->error=ASN1_R_EXPECTING_A_SEQUENCE;
+               c->error=ERR_R_EXPECTING_AN_ASN1_SEQUENCE;
                return(0);
                }
        (*length)-=(c->p-q);
        if (c->max && (*length < 0))
                {
-               c->error=ASN1_R_LENGTH_MISMATCH;
+               c->error=ERR_R_ASN1_LENGTH_MISMATCH;
                return(0);
                }
        if (c->inf == (1|V_ASN1_CONSTRUCTED))
@@ -402,6 +405,7 @@ int type;
        ret->length=0;
        ret->type=type;
        ret->data=NULL;
+       ret->flags=0;
        return(ret);
        }