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, 9 insertions, 10 deletions

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 096e4a4..daccb66 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -168,18 +168,17 @@ int EVP_CIPHER_type(const EVP_CIPHER *ctx)
 	}
 }
 
-size_t EVP_CIPHER_block_size(const EVP_CIPHER *e)
+int EVP_CIPHER_block_size(const EVP_CIPHER *e)
 	{
 	return e->block_size;
 	}
 
-size_t EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx)
+int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx)
 	{
 	return ctx->cipher->block_size;
 	}
 
-size_t EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-		  const unsigned char *in, size_t inl)
+int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl)
 	{
 	return ctx->cipher->do_cipher(ctx,out,in,inl);
 	}
@@ -209,22 +208,22 @@ void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data)
 	ctx->app_data = data;
 	}
 
-size_t EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)
+int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)
 	{
 	return cipher->iv_len;
 	}
 
-size_t EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
+int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
 	{
 	return ctx->cipher->iv_len;
 	}
 
-size_t EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
+int EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
 	{
 	return cipher->key_len;
 	}
 
-size_t EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
+int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
 	{
 	return ctx->key_len;
 	}
@@ -239,7 +238,7 @@ int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx)
 	return ctx->cipher->nid;
 	}
 
-size_t EVP_MD_block_size(const EVP_MD *md) 
+int EVP_MD_block_size(const EVP_MD *md) 
 	{
 	return md->block_size;
 	}
@@ -254,7 +253,7 @@ int EVP_MD_pkey_type(const EVP_MD *md)
 	return md->pkey_type;
 	}
 
-size_t EVP_MD_size(const EVP_MD *md)
+int EVP_MD_size(const EVP_MD *md)
 	{
 	if (!md)
 		return -1;