| Index: components/encryptor/os_crypt_posix.cc
|
| diff --git a/components/encryptor/encryptor_posix.cc b/components/encryptor/os_crypt_posix.cc
|
| similarity index 90%
|
| rename from components/encryptor/encryptor_posix.cc
|
| rename to components/encryptor/os_crypt_posix.cc
|
| index 1bcfe3d3b3348dc75f3193c89ddd1d1e6d580a0e..3dc675873dd8988d5773be778d136f45ec910920 100644
|
| --- a/components/encryptor/encryptor_posix.cc
|
| +++ b/components/encryptor/os_crypt_posix.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "components/encryptor/encryptor.h"
|
| +#include "components/encryptor/os_crypt.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -54,13 +54,13 @@ crypto::SymmetricKey* GetEncryptionKey() {
|
|
|
| } // namespace
|
|
|
| -bool Encryptor::EncryptString16(const base::string16& plaintext,
|
| - std::string* ciphertext) {
|
| +bool OSCrypt::EncryptString16(const base::string16& plaintext,
|
| + std::string* ciphertext) {
|
| return EncryptString(base::UTF16ToUTF8(plaintext), ciphertext);
|
| }
|
|
|
| -bool Encryptor::DecryptString16(const std::string& ciphertext,
|
| - base::string16* plaintext) {
|
| +bool OSCrypt::DecryptString16(const std::string& ciphertext,
|
| + base::string16* plaintext) {
|
| std::string utf8;
|
| if (!DecryptString(ciphertext, &utf8))
|
| return false;
|
| @@ -69,8 +69,8 @@ bool Encryptor::DecryptString16(const std::string& ciphertext,
|
| return true;
|
| }
|
|
|
| -bool Encryptor::EncryptString(const std::string& plaintext,
|
| - std::string* ciphertext) {
|
| +bool OSCrypt::EncryptString(const std::string& plaintext,
|
| + std::string* ciphertext) {
|
| // This currently "obfuscates" by encrypting with hard-coded password.
|
| // We need to improve this password situation by moving a secure password
|
| // into a system-level key store.
|
| @@ -98,8 +98,8 @@ bool Encryptor::EncryptString(const std::string& plaintext,
|
| return true;
|
| }
|
|
|
| -bool Encryptor::DecryptString(const std::string& ciphertext,
|
| - std::string* plaintext) {
|
| +bool OSCrypt::DecryptString(const std::string& ciphertext,
|
| + std::string* plaintext) {
|
| // This currently "obfuscates" by encrypting with hard-coded password.
|
| // We need to improve this password situation by moving a secure password
|
| // into a system-level key store.
|
|
|