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

content/renderer/webcrypto/webcrypto_impl_openssl.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 <vector>
 #include <openssl/aes.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
 #include "base/logging.h"
+#include "content/renderer/webcrypto/webcrypto_util.h"
 #include "crypto/openssl_util.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 118 matching lines @@
   int final_output_chunk_len = 0;
   if (!EVP_CipherFinal_ex(
           context.get(), buffer_data + output_len, &final_output_chunk_len))
     return false;
 
   const unsigned final_output_len =
       static_cast<unsigned>(output_len) +
       static_cast<unsigned>(final_output_chunk_len);
   DCHECK_LE(final_output_len, output_max_len);
 
-  WebCryptoImpl::ShrinkBuffer(buffer, final_output_len);
+  ShrinkBuffer(buffer, final_output_len);
 
   return true;
 }
 
 }  // namespace
 
 void WebCryptoImpl::Init() { crypto::EnsureOpenSSLInit(); }
 
 bool WebCryptoImpl::EncryptInternal(const WebKit::WebCryptoAlgorithm& algorithm,
                                     const WebKit::WebCryptoKey& key,
@@ skipping 158 matching lines @@
   if (algorithm_or_null.isNull())
     return false;
   const WebKit::WebCryptoAlgorithm& algorithm = algorithm_or_null;
 
   // TODO(padolph): Support all relevant alg types and then remove this gate.
   if (algorithm.id() != WebKit::WebCryptoAlgorithmIdHmac &&
       algorithm.id() != WebKit::WebCryptoAlgorithmIdAesCbc) {
     return false;
   }
 
-  // TODO(padolph): Need to split handling for symmetric (raw or jwk format) and
-  // asymmetric (jwk, spki, or pkcs8 format) keys.
+  // TODO(padolph): Need to split handling for symmetric (raw format) and
+  // asymmetric (spki or pkcs8 format) keys.
   // Currently only supporting symmetric.
 
-  // TODO(padolph): jwk handling. Define precedence between jwk contents and
-  // this method's parameters, e.g. 'alg' in jwk vs algorithm.id(). Who wins if
-  // they differ? (jwk, probably)
-
   // Symmetric keys are always type secret
   WebKit::WebCryptoKeyType type = WebKit::WebCryptoKeyTypeSecret;
 
   const unsigned char* raw_key_data;
   unsigned raw_key_data_size;
   switch (format) {
     case WebKit::WebCryptoKeyFormatRaw:
       raw_key_data = key_data;
       raw_key_data_size = key_data_size;
       // The NSS implementation fails when importing a raw AES key with a length
@@ skipping 131 matching lines @@
 
       break;
     }
     default:
       return false;
   }
   return true;
 }
 
 }  // namespace content