enterprise.platformKeys: Respect the 'hash' argument of generateKey.

chrome/renderer/extensions/enterprise_platform_keys_natives.cc

 // 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.
 
 #include "chrome/renderer/extensions/enterprise_platform_keys_natives.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
@@ skipping 38 matching lines @@
   if (rsaHashedKeyGen) {
     dict->SetIntegerWithoutPathExpansion("modulusLength",
                                          rsaHashedKeyGen->modulusLengthBits());
     const blink::WebVector<unsigned char>& public_exponent =
         rsaHashedKeyGen->publicExponent();
     dict->SetWithoutPathExpansion(
         "publicExponent",
         base::BinaryValue::CreateWithCopiedBuffer(
             reinterpret_cast<const char*>(public_exponent.data()),
             public_exponent.size()));
+
+    const blink::WebCryptoAlgorithm& hash = rsaHashedKeyGen->hash();
+    DCHECK(!hash.isNull());
+    const blink::WebCryptoAlgorithmInfo* hash_info =
+        blink::WebCryptoAlgorithm::lookupAlgorithmInfo(hash.id());
+
+    scoped_ptr<base::DictionaryValue> hash_dict(new base::DictionaryValue);
+    hash_dict->SetStringWithoutPathExpansion("name", hash_info->name);

[eroman, 2014/06/17 18:25:22]

isn't there a more direct id to name function? (rather than looking up and then
hash_info->name).

+    dict->SetWithoutPathExpansion("hash", hash_dict.release());
   }
   // Otherwise, |algorithm| is missing support here or no parameters were
   // required.
   return dict.Pass();
 }
 
 }  // namespace
 
 EnterprisePlatformKeysNatives::EnterprisePlatformKeysNatives(
     ScriptContext* context)
@@ skipping 32 matching lines @@
   if (!algorithm_dict)
     return;
 
   scoped_ptr<content::V8ValueConverter> converter(
       content::V8ValueConverter::create());
   call_info.GetReturnValue().Set(
       converter->ToV8Value(algorithm_dict.get(), context()->v8_context()));
 }
 
 }  // namespace extensions