| Index: crypto/symmetric_key_openssl.cc
|
| diff --git a/crypto/symmetric_key_openssl.cc b/crypto/symmetric_key_openssl.cc
|
| index e268a1d0f98c1f3d85ed4b2b8915646211f83d5c..912c9b4db2d7468e822cd8062b87ea87432bd16f 100644
|
| --- a/crypto/symmetric_key_openssl.cc
|
| +++ b/crypto/symmetric_key_openssl.cc
|
| @@ -39,8 +39,8 @@ SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
|
|
|
| OpenSSLErrStackTracer err_tracer(FROM_HERE);
|
| scoped_ptr<SymmetricKey> key(new SymmetricKey);
|
| - uint8* key_data =
|
| - reinterpret_cast<uint8*>(WriteInto(&key->key_, key_size_in_bytes + 1));
|
| + uint8* key_data = reinterpret_cast<uint8*>(
|
| + base::WriteInto(&key->key_, key_size_in_bytes + 1));
|
|
|
| int rv = RAND_bytes(key_data, static_cast<int>(key_size_in_bytes));
|
| return rv == 1 ? key.release() : NULL;
|
| @@ -70,8 +70,8 @@ SymmetricKey* SymmetricKey::DeriveKeyFromPassword(Algorithm algorithm,
|
|
|
| OpenSSLErrStackTracer err_tracer(FROM_HERE);
|
| scoped_ptr<SymmetricKey> key(new SymmetricKey);
|
| - uint8* key_data =
|
| - reinterpret_cast<uint8*>(WriteInto(&key->key_, key_size_in_bytes + 1));
|
| + uint8* key_data = reinterpret_cast<uint8*>(
|
| + base::WriteInto(&key->key_, key_size_in_bytes + 1));
|
| int rv = PKCS5_PBKDF2_HMAC_SHA1(password.data(), password.length(),
|
| reinterpret_cast<const uint8*>(salt.data()),
|
| salt.length(), iterations,
|
|
|