Reuse WebCrypto's normalizeCryptoAlgorithm in enterprise.platformKeys.

chrome/renderer/resources/extensions/enterprise_platform_keys/subtle_crypto.js

 // Copyright 2014 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.
 
 var utils = require('utils');
 var internalAPI = require('enterprise.platformKeys.internalAPI');
 var intersect = require('enterprise.platformKeys.utils').intersect;
 var KeyPair = require('enterprise.platformKeys.KeyPair').KeyPair;
 var keyModule = require('enterprise.platformKeys.Key');
 var getSpki = keyModule.getSpki;
 var KeyUsage = keyModule.KeyUsage;
 
+var normalizeAlgorithm =
+    requireNative('enterprise_platform_keys_natives').NormalizeAlgorithm;
+
 // This error is thrown by the internal and public API's token functions and
 // must be rethrown by this custom binding. Keep this in sync with the C++ part
 // of this API.
 var errorInvalidToken = "The token is not valid.";
 
 // The following errors are specified in WebCrypto.
 // TODO(pneubeck): These should be DOMExceptions.
 function CreateNotSupportedError() {
   return new Error('The algorithm is not supported');
 }
@@ skipping 42 matching lines @@
     // implementation.
 
     if (extractable) {
       // Note: This deviates from WebCrypto.SubtleCrypto.
       throw CreateNotSupportedError();
     }
     if (intersect(keyUsages, [KeyUsage.sign, KeyUsage.verify]).length !=
         keyUsages.length) {
       throw CreateDataError();
     }
-    if (!algorithm.name) {
+    var normalizedAlgorithmParameters =
+        normalizeAlgorithm(algorithm, 'GenerateKey');
+    if (!normalizedAlgorithmParameters) {
       // TODO(pneubeck): It's not clear from the WebCrypto spec which error to
       // throw here.
       throw CreateSyntaxError();
     }
 
-    if (algorithm.name.toUpperCase() !== 'RSASSA-PKCS1-V1_5') {
+    if (normalizedAlgorithmParameters.name !== 'RSASSA-PKCS1-V1_5') {
       // Note: This deviates from WebCrypto.SubtleCrypto.
       throw CreateNotSupportedError();
     }
-    if (!algorithm.modulusLength || !algorithm.publicExponent)
-      throw CreateSyntaxError();
 
-    internalAPI.generateKey(
-        subtleCrypto.tokenId, algorithm.modulusLength, function(spki) {
-          if (catchInvalidTokenError(reject))
-            return;
-          if (chrome.runtime.lastError) {
-            reject(CreateOperationError());
-            return;
-          }
-          resolve(new KeyPair(spki, algorithm, keyUsages));
-        });
+    internalAPI.generateKey(subtleCrypto.tokenId,

[eroman, 2014/06/05 23:38:28]

where does the hash come into play? i don't see it either in the generation or
signing.

[pneubeck (no reviews), 2014/06/06 12:39:45]

-> follow up CL.

+                            normalizedAlgorithmParameters.modulusLength,
+                            function(spki) {
+      if (catchInvalidTokenError(reject))
+        return;
+      if (chrome.runtime.lastError) {
+        reject(CreateOperationError());
+        return;
+      }
+      resolve(new KeyPair(spki, algorithm, keyUsages));
+    });
   });
 };
 
 SubtleCryptoImpl.prototype.sign = function(algorithm, key, dataView) {
   var subtleCrypto = this;
   return new Promise(function(resolve, reject) {
     if (key.type != 'private' || key.usages.indexOf(KeyUsage.sign) == -1)
       throw CreateInvalidAccessError();
 
+    var normalizedAlgorithmParameters =
+        normalizeAlgorithm(algorithm, 'Sign');
+    if (!normalizedAlgorithmParameters) {
+      // TODO(pneubeck): It's not clear from the WebCrypto spec which error to

[eroman, 2014/06/05 23:38:28]

The methods you plumbed through set the exception code and message to use. Not
sure which ambiguity in the spec you are refering to, but if there is one please
file it at
https://www.w3.org/Bugs/Public/enter_bug.cgi?product=Web%20Cryptography&compo...

[pneubeck (no reviews), 2014/06/06 12:39:45]

Yeah, this comment is not accurate.
a follow up CL will go over all errors / see other answer.

+      // throw here.
+      throw CreateSyntaxError();
+    }
+
     // Create an ArrayBuffer that equals the dataView. Note that dataView.buffer
     // 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());
@@ skipping 18 matching lines @@
       // TODO(pneubeck): It should be possible to export to format 'jwk'.
       throw CreateNotSupportedError();
     }
   });
 };
 
 exports.SubtleCrypto =
     utils.expose('SubtleCrypto',
                  SubtleCryptoImpl,
                  {functions:['generateKey', 'sign', 'exportKey']});