Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Side by Side Diff: components/os_crypt/os_crypt.h

Issue 1973483002: OSCrypt for POSIX uses libsecret to store a randomised encryption key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Recommendations Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/os_crypt/libsecret_util_posix.cc ('k') | components/os_crypt/os_crypt_linux.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_OS_CRYPT_OS_CRYPT_H_ 5 #ifndef COMPONENTS_OS_CRYPT_OS_CRYPT_H_
6 #define COMPONENTS_OS_CRYPT_OS_CRYPT_H_ 6 #define COMPONENTS_OS_CRYPT_OS_CRYPT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 13
14 #if defined(USE_LIBSECRET)
15 #include "components/os_crypt/key_storage_linux.h"
16 #endif
17
14 // The OSCrypt class gives access to simple encryption and decryption of 18 // The OSCrypt class gives access to simple encryption and decryption of
15 // strings. Note that on Mac, access to the system Keychain is required and 19 // strings. Note that on Mac, access to the system Keychain is required and
16 // these calls can block the current thread to collect user input. 20 // these calls can block the current thread to collect user input. The same is
21 // true for Linux, if a password management tool is available.
17 class OSCrypt { 22 class OSCrypt {
18 public: 23 public:
19 // Encrypt a string16. The output (second argument) is really an array of 24 // Encrypt a string16. The output (second argument) is really an array of
20 // bytes, but we're passing it back as a std::string. 25 // bytes, but we're passing it back as a std::string.
21 static bool EncryptString16(const base::string16& plaintext, 26 static bool EncryptString16(const base::string16& plaintext,
22 std::string* ciphertext); 27 std::string* ciphertext);
23 28
24 // Decrypt an array of bytes obtained with EncryptString16 back into a 29 // Decrypt an array of bytes obtained with EncryptString16 back into a
25 // string16. Note that the input (first argument) is a std::string, so you 30 // string16. Note that the input (first argument) is a std::string, so you
26 // need to first get your (binary) data into a string. 31 // need to first get your (binary) data into a string.
(...skipping 13 matching lines...) Expand all
40 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
41 // For unit testing purposes we instruct the Encryptor to use a mock Keychain 46 // For unit testing purposes we instruct the Encryptor to use a mock Keychain
42 // on the Mac. The default is to use the real Keychain. 47 // on the Mac. The default is to use the real Keychain.
43 static void UseMockKeychain(bool use_mock); 48 static void UseMockKeychain(bool use_mock);
44 #endif 49 #endif
45 50
46 private: 51 private:
47 DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt); 52 DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
48 }; 53 };
49 54
55 #if defined(USE_LIBSECRET) && defined(UNIT_TEST)
56 // For unit testing purposes, inject methods to be used.
57 // |get_key_storage_mock| provides the desired |KeyStorage| implementation.
58 // If the provider returns |nullptr|, a hardcoded password will be used.
59 // |get_password_v11_mock| provides a password to derive the encryption key from
60 // If both parameters are |nullptr|, the real implementation is restored.
61 void UseMockKeyStorageForTesting(KeyStorageLinux* (*get_key_storage_mock)(),
62 std::string* (*get_password_v11_mock)());
63 #endif // defined(USE_LIBSECRET) && defined(UNIT_TEST)
64
50 #endif // COMPONENTS_OS_CRYPT_OS_CRYPT_H_ 65 #endif // COMPONENTS_OS_CRYPT_OS_CRYPT_H_
OLDNEW
« no previous file with comments | « components/os_crypt/libsecret_util_posix.cc ('k') | components/os_crypt/os_crypt_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698