Revert the size_t modifications from HEAD that had led to more

knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.

1 files changed, 15 insertions, 18 deletions

diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 570aac71a7..f1a5a1e31e 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -83,13 +83,11 @@ int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp)
 	return(objsize);
 	}
 
-size_t a2d_ASN1_OBJECT(unsigned char *out, size_t olen, const char *buf,
-		       int num)
+int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
 	{
-	int i,len=0,c, use_bn;
-	unsigned first;
+	int i,first,len=0,c, use_bn;
 	char ftmp[24], *tmp = ftmp;
-	size_t tmpsize = sizeof ftmp;
+	int tmpsize = sizeof ftmp;
 	const char *p;
 	unsigned long l;
 	BIGNUM *bl = NULL;
@@ -152,11 +150,11 @@ size_t a2d_ASN1_OBJECT(unsigned char *out, size_t olen, const char *buf,
 			if (use_bn)
 				{
 				if (!BN_mul_word(bl, 10L)
-				    || !BN_add_signed_word(bl, c-'0'))
+					|| !BN_add_word(bl, c-'0'))
 					goto err;
 				}
 			else
-				l=l*10L+(c-'0');
+				l=l*10L+(long)(c-'0');
 			}
 		if (len == 0)
 			{
@@ -229,7 +227,7 @@ err:
 	return(0);
 	}
 
-int i2t_ASN1_OBJECT(char *buf, size_t buf_len, ASN1_OBJECT *a)
+int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a)
 {
 	return OBJ_obj2txt(buf, buf_len, a, 0);
 }
@@ -237,7 +235,7 @@ int i2t_ASN1_OBJECT(char *buf, size_t buf_len, ASN1_OBJECT *a)
 int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
 	{
 	char buf[80], *p = buf;
-	size_t i;
+	int i;
 
 	if ((a == NULL) || (a->data == NULL))
 		return(BIO_write(bp,"NULL",4));
@@ -258,14 +256,13 @@ int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a)
 	}
 
 ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-			     size_t length)
+	     long length)
 {
 	const unsigned char *p;
-	size_t len;
+	long len;
 	int tag,xclass;
 	int inf,i;
 	ASN1_OBJECT *ret = NULL;
-
 	p= *pp;
 	inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
 	if (inf & 0x80)
@@ -287,7 +284,7 @@ err:
 	return(NULL);
 }
 ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-			     size_t len)
+	     long len)
 	{
 	ASN1_OBJECT *ret=NULL;
 	const unsigned char *p;
@@ -312,15 +309,15 @@ ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
 		{
 		ret->length=0;
 		if (data != NULL) OPENSSL_free(data);
-		data=OPENSSL_malloc(len ? len : 1);
+		data=(unsigned char *)OPENSSL_malloc(len ? (int)len : 1);
 		if (data == NULL)
 			{ i=ERR_R_MALLOC_FAILURE; goto err; }
 		ret->flags|=ASN1_OBJECT_FLAG_DYNAMIC_DATA;
 		}
-	memcpy(data,p,len);
+	memcpy(data,p,(int)len);
 	/* reattach data to object, after which it remains const */
-	ret->data=data;
-	ret->length=len;
+	ret->data  =data;
+	ret->length=(int)len;
 	ret->sn=NULL;
 	ret->ln=NULL;
 	/* ret->flags=ASN1_OBJECT_FLAG_DYNAMIC; we know it is dynamic */
@@ -376,7 +373,7 @@ void ASN1_OBJECT_free(ASN1_OBJECT *a)
 		OPENSSL_free(a);
 	}
 
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, size_t len,
+ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
 	     const char *sn, const char *ln)
 	{
 	ASN1_OBJECT o;