[webcrypto] Add JWK import for HMAC and AES-CBC key.

content/renderer/webcrypto/webcrypto_impl_nss.cc

 // Copyright 2013 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 "content/renderer/webcrypto/webcrypto_impl.h"
 
 #include <cryptohi.h>
 #include <pk11pub.h>
 #include <sechash.h>
 
 #include <vector>
 
 #include "base/logging.h"
+#include "content/renderer/webcrypto/webcrypto_util.h"
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/secure_util.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 
 namespace content {
 
 namespace {
@@ skipping 139 matching lines @@
   }
 
   unsigned int final_output_chunk_len;
   if (SECSuccess != PK11_DigestFinal(context.get(),
                                      buffer_data + output_len,
                                      &final_output_chunk_len,
                                      output_max_len - output_len)) {
     return false;
   }
 
-  WebCryptoImpl::ShrinkBuffer(buffer, final_output_chunk_len + output_len);
+  ShrinkBuffer(buffer, final_output_chunk_len + output_len);
   return true;
 }
 
 CK_MECHANISM_TYPE HmacAlgorithmToGenMechanism(
     const WebKit::WebCryptoAlgorithm& algorithm) {
   DCHECK_EQ(algorithm.id(), WebKit::WebCryptoAlgorithmIdHmac);
   const WebKit::WebCryptoHmacKeyParams* params = algorithm.hmacKeyParams();
   DCHECK(params);
   switch (params->hash().id()) {
     case WebKit::WebCryptoAlgorithmIdSha1:
@@ skipping 27 matching lines @@
       return 512;
     case WebKit::WebCryptoAlgorithmIdSha256:
       return 512;
     default:
       return 0;
   }
 }
 
 // Converts a (big-endian) WebCrypto BigInteger, with or without leading zeros,
 // to unsigned long.
 bool BigIntegerToLong(const uint8* data,

[eroman, 2013/11/07 20:54:37]

Side-comment: this would be a good candidate to move to the util class. Not
necessarily because it will be used by OpenSSL, but because it will allow
directly testing the function from the unit-tests. As I understand the
validation on this is pretty weak right now.

No change necessary; I may do this once the new file is in place.

                       unsigned data_size,
                       unsigned long* result) {
   // TODO(padolph): Is it correct to say that empty data is an error, or does it
   // mean value 0? See https://www.w3.org/Bugs/Public/show_bug.cgi?id=23655
   if (data_size == 0)
     return false;
 
   *result = 0;
   for (size_t i = 0; i < data_size; ++i) {
     size_t reverse_i = data_size - i - 1;
@@ skipping 410 matching lines @@
       break;
     }
     default:
       return false;
   }
 
   return true;
 }
 
 }  // namespace content