More size_tification.

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

diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c
index afd27b80e1b0e8a4db35c30dc87050fa966cac57..1bf9247d8ed336d00f2278ad777805514b29f659 100644 (file)
--- a/crypto/asn1/a_bytes.c
+++ b/crypto/asn1/a_bytes.c
@@ -60,15 +60,16 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
-static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c);
+static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c);
 /* type is a 'bitmap' of acceptable string types.
  */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp,
-            long length, int type)
+ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
+                                size_t length, int type)
        {
        ASN1_STRING *ret=NULL;
-       unsigned char *p,*s;
-       long len;
+       const unsigned char *p;
+       unsigned char *s;
+       size_t len;
        int inf,tag,xclass;
        int i=0;
 
@@ -153,12 +154,13 @@ int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass)
        return(r);
        }
 
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length,
-            int Ptag, int Pclass)
+ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
+                           size_t length, int Ptag, int Pclass)
        {
        ASN1_STRING *ret=NULL;
-       unsigned char *p,*s;
-       long len;
+       const unsigned char *p;
+       unsigned char *s;
+       size_t len;
        int inf,tag,xclass;
        int i=0;
 
@@ -185,7 +187,7 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length,
 
        if (inf & V_ASN1_CONSTRUCTED)
                {
-               ASN1_CTX c;
+               ASN1_const_CTX c;
 
                c.pp=pp;
                c.p=p;
@@ -247,7 +249,7 @@ err:
  * them into the one structure that is then returned */
 /* There have been a few bug fixes for this function from
  * Paul Keogh <paul.keogh@sse.ie>, many thanks to him */
-static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c)
+static int asn1_collate_primitive(ASN1_STRING *a, ASN1_const_CTX *c)
        {
        ASN1_STRING *os=NULL;
        BUF_MEM b;
@@ -268,7 +270,7 @@ static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c)
                {
                if (c->inf & 1)
                        {
-                       c->eos=ASN1_check_infinite_end(&c->p,
+                       c->eos=ASN1_const_check_infinite_end(&c->p,
                                (long)(c->max-c->p));
                        if (c->eos) break;
                        }
@@ -296,7 +298,7 @@ static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c)
                num+=os->length;
                }
 
-       if (!asn1_Finish(c)) goto err;
+       if (!asn1_const_Finish(c)) goto err;
 
        a->length=num;
        if (a->data != NULL) OPENSSL_free(a->data);