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

Unified Diff: chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

Issue 323093003: Add the Sign-At-Most-Once restriction the enterprise.platformKeys API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
index 5493e181674be925363dc23b78c39d098cc63d9a..b79a3c0cc88402629f8ad167ae7c66aaf7df2b72 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
@@ -126,7 +126,7 @@ void GetCertDatabase(const std::string& token_id,
class GenerateRSAKeyState : public NSSOperationState {
public:
GenerateRSAKeyState(unsigned int modulus_length,
- const GenerateKeyCallback& callback);
+ const subtle::GenerateKeyCallback& callback);
virtual ~GenerateRSAKeyState() {}
virtual void OnError(const tracked_objects::Location& from,
@@ -145,14 +145,14 @@ class GenerateRSAKeyState : public NSSOperationState {
private:
// Must be called on origin thread, use CallBack() therefore.
- GenerateKeyCallback callback_;
+ subtle::GenerateKeyCallback callback_;
};
class SignState : public NSSOperationState {
public:
SignState(const std::string& public_key,
const std::string& data,
- const SignCallback& callback);
+ const subtle::SignCallback& callback);
virtual ~SignState() {}
virtual void OnError(const tracked_objects::Location& from,
@@ -172,7 +172,7 @@ class SignState : public NSSOperationState {
private:
// Must be called on origin thread, use CallBack() therefore.
- SignCallback callback_;
+ subtle::SignCallback callback_;
};
class GetCertificatesState : public NSSOperationState {
@@ -251,14 +251,15 @@ NSSOperationState::NSSOperationState()
: origin_task_runner_(base::ThreadTaskRunnerHandle::Get()) {
}
-GenerateRSAKeyState::GenerateRSAKeyState(unsigned int modulus_length,
- const GenerateKeyCallback& callback)
+GenerateRSAKeyState::GenerateRSAKeyState(
+ unsigned int modulus_length,
+ const subtle::GenerateKeyCallback& callback)
: modulus_length_(modulus_length), callback_(callback) {
}
SignState::SignState(const std::string& public_key,
const std::string& data,
- const SignCallback& callback)
+ const subtle::SignCallback& callback)
: public_key_(public_key), data_(data), callback_(callback) {
}
@@ -468,6 +469,8 @@ void RemoveCertificateWithDB(scoped_ptr<RemoveCertificateState> state,
} // namespace
+namespace subtle {
+
void GenerateRSAKey(const std::string& token_id,
unsigned int modulus_length,
const GenerateKeyCallback& callback,
@@ -508,6 +511,8 @@ void Sign(const std::string& token_id,
state_ptr);
}
+} // namespace subtle
+
void GetCertificates(const std::string& token_id,
const GetCertificatesCallback& callback,
Profile* profile) {

Powered by Google App Engine
This is Rietveld 408576698