diff options
| author | pkasting <pkasting@chromium.org> | 2015-07-20 19:03:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-21 02:03:53 +0000 |
| commit | 6692a1a70f11a0143e13b2267faadd62dcb69aec (patch) | |
| tree | 69b24a30980ef76b429af91306d41067460d2f12 /crypto | |
| parent | c9d6b31a9946a89ceac5c282265dabacc63b10c3 (diff) | |
| download | chromium_src-6692a1a70f11a0143e13b2267faadd62dcb69aec.zip chromium_src-6692a1a70f11a0143e13b2267faadd62dcb69aec.tar.gz chromium_src-6692a1a70f11a0143e13b2267faadd62dcb69aec.tar.bz2 | |
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}
Diffstat (limited to 'crypto')
| -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]; } |