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

Unified Diff: chrome/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js

Issue 331173002: enterprise.platformKeys: Respect the 'hash' argument of generateKey. (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/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js
diff --git a/chrome/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js b/chrome/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js
index b3aece17fdc6491a00294aa75ba5f4c092dcced3..531d46b70256b7c3b8f94f16c1addc76b9a2048b 100644
--- a/chrome/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js
+++ b/chrome/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js
@@ -118,7 +118,7 @@ SubtleCryptoImpl.prototype.generateKey =
reject(CreateOperationError());
return;
}
- resolve(new KeyPair(spki, algorithm, keyUsages));
+ resolve(new KeyPair(spki, normalizedAlgorithmParameters, keyUsages));
});
});
};
@@ -141,16 +141,19 @@ SubtleCryptoImpl.prototype.sign = function(algorithm, key, dataView) {
// might contain more data than dataView.
var data = dataView.buffer.slice(dataView.byteOffset,
dataView.byteOffset + dataView.byteLength);
- internalAPI.sign(
- subtleCrypto.tokenId, getSpki(key), data, function(signature) {
- if (catchInvalidTokenError(reject))
- return;
- if (chrome.runtime.lastError) {
- reject(CreateOperationError());
- return;
- }
- resolve(signature);
- });
+ internalAPI.sign(subtleCrypto.tokenId,
+ getSpki(key),
+ key.algorithm.hash.name,
+ data,
+ function(signature) {
+ if (catchInvalidTokenError(reject))
+ return;
+ if (chrome.runtime.lastError) {
+ reject(CreateOperationError());
+ return;
+ }
+ resolve(signature);
+ });
});
};

Powered by Google App Engine
This is Rietveld 408576698