Update some comments and code to reflect the fact that HMAC() is no longer hostile to NULL key data.

content/child/webcrypto/openssl/hmac_openssl.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 <openssl/hmac.h>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "content/child/webcrypto/algorithm_implementation.h"
 #include "content/child/webcrypto/crypto_data.h"
@@ skipping 20 matching lines @@
                 const blink::WebCryptoAlgorithm& hash,
                 const CryptoData& data,
                 std::vector<uint8_t>* buffer) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   const EVP_MD* digest_algorithm = GetDigest(hash.id());
   if (!digest_algorithm)
     return Status::ErrorUnsupported();
   unsigned int hmac_expected_length = EVP_MD_size(digest_algorithm);
 
-  // OpenSSL wierdness here.
-  // First, HMAC() needs a void* for the key data, so make one up front as a
-  // cosmetic to avoid a cast. Second, OpenSSL does not like a NULL key,
-  // which will result if the raw_key vector is empty; an entirely valid
-  // case. Handle this specific case by pointing to a fresh array.
-  const unsigned char null_key[] = {0};
-  const void* const raw_key_voidp = raw_key.size() ? &raw_key[0] : null_key;
+  // HMAC() needs a void* for the key data, so make one up front as a
+  // cosmetic to avoid a cast.
+  const void* const raw_key_voidp = raw_key.empty() ? NULL : &raw_key[0];

[davidben, 2015/03/04 19:40:59]

vector_as_array?

 
   buffer->resize(hmac_expected_length);
   crypto::ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> hmac_result(
       vector_as_array(buffer), hmac_expected_length);
 
   unsigned int hmac_actual_length;
   unsigned char* const success =
       HMAC(digest_algorithm, raw_key_voidp, raw_key.size(), data.bytes(),
            data.byte_length(), hmac_result.safe_buffer(), &hmac_actual_length);
   if (!success || hmac_actual_length != hmac_expected_length)
@@ skipping 170 matching lines @@
 
 }  // namespace
 
 AlgorithmImplementation* CreatePlatformHmacImplementation() {
   return new HmacImplementation;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content