diff options
Diffstat (limited to 'crypto/symmetric_key_win.cc')
| -rw-r--r-- | crypto/symmetric_key_win.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crypto/symmetric_key_win.cc b/crypto/symmetric_key_win.cc index d2034e0..87e0bc3 100644 --- a/crypto/symmetric_key_win.cc +++ b/crypto/symmetric_key_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -50,11 +50,12 @@ ALG_ID GetAESAlgIDForKeySize(size_t key_size_in_bits) { // TODO(wtc): use this function in hmac_win.cc. bool ImportRawKey(HCRYPTPROV provider, ALG_ID alg, - const void* key_data, DWORD key_size, + const void* key_data, size_t key_size, ScopedHCRYPTKEY* key) { DCHECK_GT(key_size, 0); - DWORD actual_size = sizeof(PlaintextBlobHeader) + key_size; + DWORD actual_size = + static_cast<DWORD>(sizeof(PlaintextBlobHeader) + key_size); std::vector<BYTE> tmp_data(actual_size); BYTE* actual_key = &tmp_data[0]; memcpy(actual_key + sizeof(PlaintextBlobHeader), key_data, key_size); @@ -66,7 +67,7 @@ bool ImportRawKey(HCRYPTPROV provider, key_header->hdr.bVersion = CUR_BLOB_VERSION; key_header->hdr.aiKeyAlg = alg; - key_header->cbKeySize = key_size; + key_header->cbKeySize = static_cast<DWORD>(key_size); HCRYPTKEY unsafe_key = NULL; DWORD flags = CRYPT_EXPORTABLE; @@ -184,7 +185,7 @@ bool GenerateHMACKey(size_t key_size_in_bits, if (!ok) return false; - DWORD key_size_in_bytes = key_size_in_bits / 8; + DWORD key_size_in_bytes = static_cast<DWORD>(key_size_in_bits / 8); scoped_array<BYTE> random(new BYTE[key_size_in_bytes]); ok = CryptGenRandom(safe_provider, key_size_in_bytes, random.get()); if (!ok) @@ -258,7 +259,7 @@ bool ComputePBKDF2Block(HCRYPTHASH hash, // Iteration U_1: Compute PRF for S. ok = CryptHashData(safe_hash, reinterpret_cast<const BYTE*>(salt.data()), - salt.size(), 0); + static_cast<DWORD>(salt.size()), 0); if (!ok) return false; |