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

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

Issue 331173002: enterprise.platformKeys: Respect the 'hash' argument of generateKey. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. 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_service.cc
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
index 124cb7a6db1e1d44b1df720d7db8a3f42b2f3a51..9b1d0b52a6ccbc5446fd81d65a8211bd1c336235 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_service.cc
@@ -49,6 +49,7 @@ void WrapGenerateKeyCallback(
// |callback| with an error.
void CheckValidityAndSign(const std::string& token_id,
const std::string& public_key_spki_der,
+ platform_keys::HashAlgorithm hash_algorithm,
const std::string& data,
const PlatformKeysService::SignCallback& callback,
content::BrowserContext* browser_context,
@@ -58,8 +59,12 @@ void CheckValidityAndSign(const std::string& token_id,
kErrorKeyNotAllowedForSigning);
return;
}
- platform_keys::subtle::Sign(
- token_id, public_key_spki_der, data, callback, browser_context);
+ platform_keys::subtle::Sign(token_id,
+ public_key_spki_der,
+ hash_algorithm,
+ data,
+ callback,
+ browser_context);
}
} // namespace
@@ -94,6 +99,7 @@ void PlatformKeysService::GenerateRSAKey(const std::string& token_id,
void PlatformKeysService::Sign(const std::string& token_id,
const std::string& public_key_spki_der,
+ platform_keys::HashAlgorithm hash_algorithm,
const std::string& data,
const std::string& extension_id,
const SignCallback& callback) {
@@ -103,6 +109,7 @@ void PlatformKeysService::Sign(const std::string& token_id,
base::Bind(&CheckValidityAndSign,
token_id,
public_key_spki_der,
+ hash_algorithm,
data,
callback,
browser_context_));

Powered by Google App Engine
This is Rietveld 408576698