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.

crypto/objects/o_names.c

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 992a6ee..84380a9 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -289,7 +289,7 @@
 struct doall_sorted
 	{
 	int type;
-	size_t n;
+	int n;
 	const OBJ_NAME **names;
 	};
 
@@ -322,7 +322,7 @@
 	d.n=0;
 	OBJ_NAME_do_all(type,do_all_sorted_fn,&d);
 
-	qsort(d.names,d.n,sizeof *d.names,do_all_sorted_cmp);
+	qsort((void *)d.names,d.n,sizeof *d.names,do_all_sorted_cmp);
 
 	for(n=0 ; n < d.n ; ++n)
 		fn(d.names[n],arg);

crypto/objects/obj_dat.c

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 1582d61..e999ef7 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -431,8 +431,7 @@
 	unsigned char *buf;
 	unsigned char *p;
 	const unsigned char *cp;
-	size_t i;
-	size_t j;
+	int i, j;
 
 	if(!no_name) {
 		if( ((nid = OBJ_sn2nid(s)) != NID_undef) ||
@@ -442,7 +441,7 @@
 
 	/* Work out size of content octets */
 	i=a2d_ASN1_OBJECT(NULL,0,s,-1);
-	if (i == 0) {
+	if (i <= 0) {
 		/* Don't clear the error */
 		/*ERR_clear_error();*/
 		return NULL;
@@ -450,7 +449,7 @@
 	/* Work out total size */
 	j = ASN1_object_size(0,i,V_ASN1_OBJECT);
 
-	if((buf=OPENSSL_malloc(j)) == NULL) return NULL;
+	if((buf=(unsigned char *)OPENSSL_malloc(j)) == NULL) return NULL;
 
 	p = buf;
 	/* Write out tag+length */
@@ -464,7 +463,7 @@
 	return op;
 	}
 
-int OBJ_obj2txt(char *buf, size_t buf_len, const ASN1_OBJECT *a, int no_name)
+int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 {
 	int i,n=0,len,nid, first, use_bn;
 	BIGNUM *bl;
@@ -509,7 +508,7 @@
 				goto err;
 			if (use_bn)
 				{
-				if (!BN_add_word(bl, c & 0x7fU))
+				if (!BN_add_word(bl, c & 0x7f))
 					goto err;
 				}
 			else
@@ -783,13 +782,12 @@
 	int ok=0;
 	ASN1_OBJECT *op=NULL;
 	unsigned char *buf;
-	size_t i;
+	int i;
 
 	i=a2d_ASN1_OBJECT(NULL,0,oid,-1);
-	if (i == 0)
-	    return 0;
+	if (i <= 0) return(0);
 
-	if ((buf=OPENSSL_malloc(i)) == NULL)
+	if ((buf=(unsigned char *)OPENSSL_malloc(i)) == NULL)
 		{
 		OBJerr(OBJ_F_OBJ_CREATE,ERR_R_MALLOC_FAILURE);
 		return(0);
@@ -797,7 +795,7 @@
 	i=a2d_ASN1_OBJECT(buf,i,oid,-1);
 	if (i == 0)
 		goto err;
-	op=ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
+	op=(ASN1_OBJECT *)ASN1_OBJECT_create(OBJ_new_nid(1),buf,i,sn,ln);
 	if (op == NULL) 
 		goto err;
 	ok=OBJ_add_object(op);

crypto/objects/obj_lib.c

diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 44380cd..23e9d48 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -65,7 +65,7 @@
 ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
 	{
 	ASN1_OBJECT *r;
-	size_t i;
+	int i;
 	char *ln=NULL,*sn=NULL;
 	unsigned char *data=NULL;
 

crypto/objects/objects.h

diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index 10c198a..65b6f01 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -1006,8 +1006,7 @@
 const char *	OBJ_nid2sn(int n);
 int		OBJ_obj2nid(const ASN1_OBJECT *o);
 ASN1_OBJECT *	OBJ_txt2obj(const char *s, int no_name);
-int             OBJ_obj2txt(char *buf, size_t buf_len, const ASN1_OBJECT *a,
-			    int no_name);
+int	OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name);
 int		OBJ_txt2nid(const char *s);
 int		OBJ_ln2nid(const char *s);
 int		OBJ_sn2nid(const char *s);