Index: crypto/symmetric_key.cc |
diff --git a/crypto/symmetric_key_openssl.cc b/crypto/symmetric_key.cc |
similarity index 97% |
rename from crypto/symmetric_key_openssl.cc |
rename to crypto/symmetric_key.cc |
index 5aef1d4ffc11f2da50fa1a89e68141643bd18fbf..4da8bd8662f85490a9148c62fb7879044ffdbc05 100644 |
--- a/crypto/symmetric_key_openssl.cc |
+++ b/crypto/symmetric_key.cc |
@@ -76,8 +76,9 @@ SymmetricKey* SymmetricKey::DeriveKeyFromPassword(Algorithm algorithm, |
base::WriteInto(&key->key_, key_size_in_bytes + 1)); |
int rv = PKCS5_PBKDF2_HMAC_SHA1( |
password.data(), password.length(), |
- reinterpret_cast<const uint8_t*>(salt.data()), salt.length(), iterations, |
- static_cast<int>(key_size_in_bytes), key_data); |
+ reinterpret_cast<const uint8_t*>(salt.data()), salt.length(), |
+ static_cast<unsigned>(iterations), |
+ key_size_in_bytes, key_data); |
return rv == 1 ? key.release() : NULL; |
} |