Fix and enable MSVC warning C4018 for crypto/.

BUG=398202 TEST=none Review URL: https://codereview.chromium.org/1241113003 Cr-Commit-Position: refs/heads/master@{#339595}
Denger-Network · Jul 21, 2015 · 6692a1a · 6692a1a
1 parent c9d6b31
commit 6692a1a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
@@ -94,7 +94,6 @@
         [ 'OS == "win"', {
           'msvs_disabled_warnings': [
             4267,  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-            4018,
           ],
         }],
         [ 'use_openssl==1', {
@@ -261,9 +260,6 @@
            'CRYPTO_IMPLEMENTATION',
            '<@(nacl_win64_defines)',
           ],
-          'msvs_disabled_warnings': [
-            4018,
-          ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',

diff --git a/crypto/symmetric_key_win.cc b/crypto/symmetric_key_win.cc
@@ -295,7 +295,7 @@ bool ComputePBKDF2Block(HCRYPTHASH hash,
     if (!ok || size != hash_size)
       return false;
 
-    for (int i = 0; i < hash_size; ++i)
+    for (DWORD i = 0; i < hash_size; ++i)
       output_buf[i] ^= hash_value[i];
   }