Commit 9e0aad9f authored by Andy Polyakov's avatar Andy Polyakov
Browse files

size_t-fication of message digest APIs. We should size_t-fy more APIs...

parent 1c7a0e28

crypto/engine/eng_openssl.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int test_sha1_init(EVP_MD_CTX *ctx) 
#endif

	return SHA1_Init(ctx->md_data);

	}

static int test_sha1_update(EVP_MD_CTX *ctx,const void *data,unsigned long count)

static int test_sha1_update(EVP_MD_CTX *ctx,const void *data,size_t count)

	{

#ifdef TEST_ENG_OPENSSL_SHA_P_UPDATE

	fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_update() called\n");

crypto/evp/digest.c

+3 −3
Original line number Diff line number Diff line
@@ -208,9 +208,9 @@ skip_to_init: 
	}



int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data,

	     unsigned int count)

	     size_t count)

	{

	return ctx->digest->update(ctx,data,(unsigned long)count);

	return ctx->digest->update(ctx,data,count);

	}



/* The caller can assume that this removes any secret data from the context */
@@ -285,7 +285,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in) 
	return 1;

	}



int EVP_Digest(const void *data, unsigned int count,

int EVP_Digest(const void *data, size_t count,

		unsigned char *md, unsigned int *size, const EVP_MD *type, ENGINE *impl)

	{

	EVP_MD_CTX ctx;

crypto/evp/evp.h

+3 −3
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct env_md_st 
	int md_size;

	unsigned long flags;

	int (*init)(EVP_MD_CTX *ctx);

	int (*update)(EVP_MD_CTX *ctx,const void *data,unsigned long count);

	int (*update)(EVP_MD_CTX *ctx,const void *data,size_t count);

	int (*final)(EVP_MD_CTX *ctx,unsigned char *md);

	int (*copy)(EVP_MD_CTX *to,const EVP_MD_CTX *from);

	int (*cleanup)(EVP_MD_CTX *ctx);
@@ -490,9 +490,9 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); 
#define EVP_MD_CTX_test_flags(ctx,flgs) ((ctx)->flags&(flgs))

int	EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);

int	EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d,

			 unsigned int cnt);

			 size_t cnt);

int	EVP_DigestFinal_ex(EVP_MD_CTX *ctx,unsigned char *md,unsigned int *s);

int	EVP_Digest(const void *data, unsigned int count,

int	EVP_Digest(const void *data, size_t count,

		unsigned char *md, unsigned int *size, const EVP_MD *type, ENGINE *impl);



int     EVP_MD_CTX_copy(EVP_MD_CTX *out,const EVP_MD_CTX *in);

crypto/evp/m_dss.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
static int init(EVP_MD_CTX *ctx)

	{ return SHA1_Init(ctx->md_data); }



static int update(EVP_MD_CTX *ctx,const void *data,unsigned long count)

static int update(EVP_MD_CTX *ctx,const void *data,size_t count)

	{ return SHA1_Update(ctx->md_data,data,count); }



static int final(EVP_MD_CTX *ctx,unsigned char *md)

crypto/evp/m_dss1.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
static int init(EVP_MD_CTX *ctx)

	{ return SHA1_Init(ctx->md_data); }



static int update(EVP_MD_CTX *ctx,const void *data,unsigned long count)

static int update(EVP_MD_CTX *ctx,const void *data,size_t count)

	{ return SHA1_Update(ctx->md_data,data,count); }



static int final(EVP_MD_CTX *ctx,unsigned char *md)