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

Unified Diff: components/os_crypt/os_crypt_mocker_linux.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: More fix for non-linux Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: components/os_crypt/os_crypt_mocker_linux.h
diff --git a/components/os_crypt/os_crypt_mocker_linux.h b/components/os_crypt/os_crypt_mocker_linux.h
new file mode 100644
index 0000000000000000000000000000000000000000..5b6e4bc3f5d5cc76d19ebc7c75ec7585045cc144
--- /dev/null
+++ b/components/os_crypt/os_crypt_mocker_linux.h
@@ -0,0 +1,49 @@
+// Copyright 2016 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.
+
+#ifndef COMPONENTS_OS_CRYPT_OS_CRYPT_MOCKER_LINUX_H_
+#define COMPONENTS_OS_CRYPT_OS_CRYPT_MOCKER_LINUX_H_
+
+#include <string>
+
+#include "base/macros.h"
+#include "base/memory/singleton.h"
Lei Zhang 2016/05/20 21:15:33 Not needed in the header.
sevenfold1999AC 2016/05/22 07:13:46 Acknowledged.
cfroussios 2016/05/23 09:31:22 Done.
+#include "base/strings/string_piece.h"
+#include "components/os_crypt/key_storage_linux.h"
+
+// Holds and serves a password from memory.
+class OSCryptMockerLinux : public KeyStorageLinux {
+ public:
+ OSCryptMockerLinux() = default;
+ ~OSCryptMockerLinux() override = default;
+
+ // KeyStorageLinux
+ std::string GetKey() override;
+
+ // Set the password that |KeyStorageMock| holds
+ void ResetTo(base::StringPiece new_key);
+
+ // Get a pointer to the stored password. |KeyStorageMock| owns the pointer
Lei Zhang 2016/05/20 21:15:33 |KeyStorageMock| -> OSCryptMockerLinux
sevenfold1999AC 2016/05/22 07:13:45 Done.
sevenfold1999AC 2016/05/22 07:13:46 Acknowledged.
cfroussios 2016/05/23 09:31:22 Done.
+ std::string* GetKeyPtr();
+
+ // Getter for the singleton
+ static OSCryptMockerLinux* GetInstance();
+
+ // Inject the singleton mock into OSCrypt.
+ static void SetUpWithSingleton();
+
+ // Restore OSCrypt to its real behaviour.
+ static void TearDown();
+
+ protected:
+ // KeyStorageLinux
+ bool Init() override;
+
+ private:
+ std::string key_;
+
+ DISALLOW_COPY_AND_ASSIGN(OSCryptMockerLinux);
+};
+
+#endif // COMPONENTS_OS_CRYPT_OS_CRYPT_MOCKER_LINUX_H_

Powered by Google App Engine
This is Rietveld 408576698