commit b9cfaa0c7f41c7adb28755cb7bc46a624e98d3b6
author Paul Bakker <p.j.bakker@offspark.com> Fri Oct 11 18:58:55 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Oct 14 15:50:40 2013 +0200
tree 35ec6c0d3f988739532ef344678b79b3cbf42db0
parent b887f1119e2209b23b4beff34b4a8b2c78b2cf61

Explicit conversions and minor changes to prevent MSVC compiler warnings

library/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index 9ef557c..16821b0 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -225,7 +225,7 @@
                        const unsigned char *salt, size_t saltlen,
                        md_type_t md_type, int id, int iterations )
 {
-    int ret, i;
+    int ret;
     unsigned int j;
 
     unsigned char diversifier[128];
@@ -234,7 +234,7 @@
     unsigned char *p;
     unsigned char c;
 
-    size_t hlen, use_len, v;
+    size_t hlen, use_len, v, i;
 
     const md_info_t *md_info;
     md_context_t md_ctx;
@@ -281,7 +281,7 @@
             goto exit;
 
         // Perform remaining ( iterations - 1 ) recursive hash calculations
-        for( i = 1; i < iterations; i++ )
+        for( i = 1; i < (size_t) iterations; i++ )
         {
             if( ( ret = md( md_info, hash_output, hlen, hash_output ) ) != 0 )
                 goto exit;