[webcrypto] Add JWK symmetric key RSAES-PKCS1-v1_5 wrap / unwrap for NSS.

content/child/webcrypto/jwk.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 <algorithm>
 #include <functional>
 #include <map>
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
@@ skipping 147 matching lines @@
 
 base::LazyInstance<JwkAlgorithmRegistry> jwk_alg_registry =
     LAZY_INSTANCE_INITIALIZER;
 
 bool ImportAlgorithmsConsistent(const blink::WebCryptoAlgorithm& alg1,
                                 const blink::WebCryptoAlgorithm& alg2) {
   DCHECK(!alg1.isNull());
   DCHECK(!alg2.isNull());
   if (alg1.id() != alg2.id())
     return false;
-  if (alg1.paramsType() != alg2.paramsType())
-    return false;
-  switch (alg1.paramsType()) {
-    case blink::WebCryptoAlgorithmParamsTypeNone:
-      return true;
-    case blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams:
-      return ImportAlgorithmsConsistent(alg1.rsaHashedImportParams()->hash(),
-                                        alg2.rsaHashedImportParams()->hash());
-    case blink::WebCryptoAlgorithmParamsTypeHmacImportParams:
-      return ImportAlgorithmsConsistent(alg1.hmacImportParams()->hash(),
-                                        alg2.hmacImportParams()->hash());
-    default:
+  // Inner hash algorithms must be compared too, but only if present.
+  if (alg1.paramsType() ==
+          blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams ||
+      alg1.paramsType() ==
+          blink::WebCryptoAlgorithmParamsTypeHmacImportParams) {
+    if (alg1.paramsType() != alg2.paramsType())
       return false;
+    switch (alg1.paramsType()) {
+      case blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams:
+        return ImportAlgorithmsConsistent(alg1.rsaHashedImportParams()->hash(),
+                                          alg2.rsaHashedImportParams()->hash());
+      case blink::WebCryptoAlgorithmParamsTypeHmacImportParams:
+        return ImportAlgorithmsConsistent(alg1.hmacImportParams()->hash(),
+                                          alg2.hmacImportParams()->hash());
+      default:
+        return false;
+    }
   }
+  return true;
 }
 
 // Extracts the required string property with key |path| from |dict| and saves
 // the result to |*result|. If the property does not exist or is not a string,
 // returns an error.
 Status GetJwkString(base::DictionaryValue* dict,
                     const std::string& path,
                     std::string* result) {
   base::Value* value = NULL;
   if (!dict->Get(path, &value))
@@ skipping 189 matching lines @@
 }  // namespace
 
 Status ImportKeyJwk(const CryptoData& key_data,
                     const blink::WebCryptoAlgorithm& algorithm_or_null,
                     bool extractable,
                     blink::WebCryptoKeyUsageMask usage_mask,
                     blink::WebCryptoKey* key) {
   // TODO(padolph): Generalize this comment to include export, and move to top
   // of file.
 
-  // TODO(padolph): Generalize this comment to include export, and move to top
-  // of file.
-
   // The goal of this method is to extract key material and meta data from the
   // incoming JWK, combine them with the input parameters, and ultimately import
   // a Web Crypto Key.
   //
   // JSON Web Key Format (JWK)
   // http://tools.ietf.org/html/draft-ietf-jose-json-web-key-21
   //
   // A JWK is a simple JSON dictionary with the following entries
   // - "kty" (Key Type) Parameter, REQUIRED
   // - <kty-specific parameters, see below>, REQUIRED
@@ skipping 359 matching lines @@
   std::string json;
   base::JSONWriter::Write(&jwk_dict, &json);
   *buffer = CreateArrayBuffer(reinterpret_cast<const uint8*>(json.data()),
                               json.size());
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content