diff options
| -rw-r--r-- | crypto/crypto.gyp | 4 | ||||
| -rw-r--r-- | crypto/symmetric_key_win.cc | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 6327ce7..5153fa8 100644 --- 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 index b3d65f6..ec9cfa0 100644 --- 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]; } |