[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  5d99881e6a58a8775b8ca866b794f615a16bb033 (commit)
      from  c1ec4db33d0a0d95b1d7ff1cf0536df768e7c790 (commit)


- Log -----------------------------------------------------------------
commit 5d99881e6a58a8775b8ca866b794f615a16bb033
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Nov 16 22:45:05 2017 +0100

    Iron out /WX errors in VC-WIN32.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/siphash_internal_test.c | 4 ++--
 test/sslapitest.c            | 4 ++--
 test/x509_internal_test.c    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index 5401e8c..d832aab 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -235,10 +235,10 @@ static int test_siphash(int idx)
 
     /* key and in data are 00 01 02 ... */
     for (i = 0; i < sizeof(key); i++)
-        key[i] = i;
+        key[i] = (unsigned char)i;
 
     for (i = 0; i < inlen; i++)
-        in[i] = i;
+        in[i] = (unsigned char)i;
 
     if (!TEST_true(SipHash_Init(&siphash, key, expectedlen, 0, 0)))
         return 0;
diff --git a/test/sslapitest.c b/test/sslapitest.c
index b587857..706f277 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -1819,7 +1819,7 @@ static int early_data_skip_helper(int hrr, int idx)
          * time. It could be any value as long as it is not within tolerance.
          * This should mean the ticket is rejected.
          */
-        if (!TEST_true(SSL_SESSION_set_time(sess, time(NULL) - 20)))
+        if (!TEST_true(SSL_SESSION_set_time(sess, (long)(time(NULL) - 20))))
             goto end;
     }
 
@@ -1984,7 +1984,7 @@ static int alpn_select_cb(SSL *ssl, const unsigned char **out,
 
     for (prot = in; prot < in + inlen; prot += protlen) {
         protlen = *prot++;
-        if (in + inlen - prot < protlen)
+        if (in + inlen < prot + protlen)
             return SSL_TLSEXT_ERR_NOACK;
 
         if (protlen == strlen(servalpn)
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 2385d53..03bbcf2 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -35,7 +35,7 @@
 # pragma names restore
 #endif
 
-static int test_standard_exts()
+static int test_standard_exts(void)
 {
     size_t i;
     int prev = -1, good = 1;