[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  652d4a8c83f1dd33b2e617e8cc7d0cfea3d0aedf (commit)
      from  68db80e2d1accdd4c4a6b4763559c6cfe9663820 (commit)


- Log -----------------------------------------------------------------
commit 652d4a8c83f1dd33b2e617e8cc7d0cfea3d0aedf
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Nov 21 17:58:12 2015 +0100

    Update dasync to use size_t for the sha1 update
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    
    MR #1350

-----------------------------------------------------------------------

Summary of changes:
 engines/e_dasync.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 76171b1..04f72a4 100644
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -87,7 +87,7 @@ static void dummy_pause_job(void);
 /* SHA1 */
 static int dasync_sha1_init(EVP_MD_CTX *ctx);
 static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data,
-                             unsigned long count);
+                             size_t count);
 static int dasync_sha1_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 static const EVP_MD dasync_sha1 = {
@@ -269,7 +269,7 @@ static int dasync_sha1_init(EVP_MD_CTX *ctx)
 }
 
 static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data,
-                             unsigned long count)
+                             size_t count)
 {
     dummy_pause_job();