commit a697bf503ad97c74b43d2ff01aa07c6629d23c16
author Simon B <simonb@redtangent.net> Thu Nov 10 13:19:42 2016 +0000
committer Janos Follath <janos.follath@arm.com> Thu Nov 10 15:40:53 2016 +0000
tree 1340fbff3e42d863b9a28bf0cafa4c6e5e95bd23
parent c1d54bb7b2a80d0f153fd92a13e1b901778f17d3

Fix for MSVC Compiler warnings

Fixes Microsoft Visual C compiler warnings in multiple files. All issues
with type mismatches.

library/ccm.c

diff --git a/library/ccm.c b/library/ccm.c
index e397e0a..bc3700f 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -140,7 +140,7 @@
 {
     int ret;
     unsigned char i;
-    unsigned char q = 16 - 1 - iv_len;
+    unsigned char q;
     size_t len_left, olen;
     unsigned char b[16];
     unsigned char y[16];
@@ -163,6 +163,8 @@
     if( add_len > 0xFF00 )
         return( POLARSSL_ERR_CCM_BAD_INPUT );
 
+    q = 16 - 1 - (unsigned char) iv_len;
+
     /*
      * First block B_0:
      * 0        .. 0        flags
@@ -254,7 +256,7 @@
 
     while( len_left > 0 )
     {
-        unsigned char use_len = len_left > 16 ? 16 : len_left;
+        size_t use_len = len_left > 16 ? 16 : len_left;
 
         if( mode == CCM_ENCRYPT )
         {