[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  358558eba8a55e152d7ffcdf98cd561f46aeb9a3 (commit)
      from  2ac6bdc02931ead9e028d6e41640b035e78bc722 (commit)


- Log -----------------------------------------------------------------
commit 358558eba8a55e152d7ffcdf98cd561f46aeb9a3
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date:   Tue Aug 2 12:20:45 2016 +0300

    speed.c: use size_t instead of int to match function signatures
    
    Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1378)

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

Summary of changes:
 apps/speed.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/speed.c b/apps/speed.c
index e04a440..ce01a6f 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -167,7 +167,7 @@ typedef struct loopargs_st {
     EC_KEY *ecdh_b[EC_NUM];
     unsigned char *secret_a;
     unsigned char *secret_b;
-    int         outlen;
+    size_t      outlen;
     kdf_fn      kdf;
 #endif
     EVP_CIPHER_CTX *ctx;
@@ -1046,7 +1046,8 @@ static int ECDH_compute_key_loop(void *args)
     EC_KEY **ecdh_a = tempargs->ecdh_a;
     EC_KEY **ecdh_b = tempargs->ecdh_b;
     unsigned char *secret_a = tempargs->secret_a;
-    int count, outlen = tempargs->outlen;
+    int count;
+    size_t outlen = tempargs->outlen;
     kdf_fn kdf = tempargs->kdf;
 
     for (count = 0; COND(ecdh_c[testnum][0]); count++) {
@@ -1057,7 +1058,7 @@ static int ECDH_compute_key_loop(void *args)
     return count;
 }
 
-static const int KDF1_SHA1_len = 20;
+static const size_t KDF1_SHA1_len = 20;
 static void *KDF1_SHA1(const void *in, size_t inlen, void *out,
                        size_t *outlen)
 {