Refactor webcrypto unittests.

content/renderer/webcrypto_impl_unittest.cc

Index: content/renderer/webcrypto_impl_unittest.cc
diff --git a/content/renderer/webcrypto_impl_unittest.cc b/content/renderer/webcrypto_impl_unittest.cc
index 8a9a1004b86027bb4f7bcb82d35a669ab4d92840..1ce083d821e6b4b2b1229725514ace6a4a12e342 100644
--- a/content/renderer/webcrypto_impl_unittest.cc
+++ b/content/renderer/webcrypto_impl_unittest.cc
@@ -16,17 +16,65 @@
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 
-namespace content {
+using namespace WebKit;

[eroman, 2013/09/21 22:23:45]

Not sure if this is OK; the style guide says no "using namespace", but not sure
if that applies to test files...

 
-const WebKit::WebCryptoAlgorithmId kAlgorithmIds[] = {
-    WebKit::WebCryptoAlgorithmIdSha1,
-    WebKit::WebCryptoAlgorithmIdSha224,
-    WebKit::WebCryptoAlgorithmIdSha256,
-    WebKit::WebCryptoAlgorithmIdSha384,
-    WebKit::WebCryptoAlgorithmIdSha512
-};
+namespace content {
 
 class WebCryptoImplTest : public testing::Test, public WebCryptoImpl {
+ public:
+  WebCryptoKey ImportSecretKeyFromRawHexString(

[eroman, 2013/09/21 22:23:45]

Extracted from HMACSampleSets()

+      const std::string& key_hex,
+      const WebCryptoAlgorithm& algorithm,
+      WebCryptoKeyUsageMask usage) {
+    WebCryptoKeyType type;
+    scoped_ptr<WebCryptoKeyHandle> handle;
+
+    std::vector<uint8> key_raw = HexStringToBytes(key_hex);
+
+    EXPECT_TRUE(ImportKeyInternal(WebCryptoKeyFormatRaw,
+                                  key_raw.data(),
+                                  key_raw.size(),
+                                  algorithm,
+                                  usage,
+                                  &handle,
+                                  &type));
+
+    EXPECT_EQ(WebCryptoKeyTypeSecret, type);
+    EXPECT_TRUE(handle.get());
+
+    WebCryptoKey crypto_key = WebCryptoKey::create(handle.release(),
+                                                   type,
+                                                   /*extracatable=*/false,
+                                                   algorithm,
+                                                   WebCryptoKeyUsageSign);
+
+    return crypto_key;
+  }
+
+  std::vector<uint8> HexStringToBytes(const std::string& hex) {
+    std::vector<uint8> bytes;
+    base::HexStringToBytes(hex, &bytes);
+    return bytes;
+  }
+
+  void ExpectArrayBufferMatchesHex(const std::string& expected_hex,
+                                   const WebArrayBuffer& array_buffer) {
+    EXPECT_STRCASEEQ(
+        expected_hex.c_str(),
+        base::HexEncode(
+            array_buffer.data(), array_buffer.byteLength()).c_str());
+  }
+
+  WebCryptoAlgorithm CreateAlgorithm(WebCryptoAlgorithmId id) {
+    return WebCryptoAlgorithm::adoptParamsAndCreate(id, NULL);
+  }
+
+  WebCryptoAlgorithm CreateHmacAlgorithm(
+      WebCryptoAlgorithmId hashId) {
+    return WebCryptoAlgorithm::adoptParamsAndCreate(
+        WebCryptoAlgorithmIdHmac,
+        new WebCryptoHmacParams(CreateAlgorithm(hashId)));
+  }
 };
 
 TEST_F(WebCryptoImplTest, DigestSampleSets) {
@@ -34,115 +82,102 @@ TEST_F(WebCryptoImplTest, DigestSampleSets) {
   //
   // TODO(bryaneyler): Eventually, all these sample test sets should be replaced
   // with the sets here: http://csrc.nist.gov/groups/STM/cavp/index.html#03
-  struct {
-    const char* input;
-    unsigned input_length;
-    const char* hex_result[arraysize(kAlgorithmIds)];
-  } input_set[] = {
-    {
-      "", 0,
-      {
-        // echo -n "" | sha1sum
-        "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-        // echo -n "" | sha224sum
-        "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f",
-        // echo -n "" | sha256sum
-        "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-        // echo -n "" | sha384sum
-        "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274e"
-        "debfe76f65fbd51ad2f14898b95b",
-        // echo -n "" | sha512sum
-        "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0"
-        "d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
-      },
+  //
+  // Results were generated using the command sha{1,224,256,384,512}sum.
+  struct TestCase {

[eroman, 2013/09/21 22:23:45]

Changed the format a bit:
  * flattened the test expectations so algorithm is explicit rather than array
index.
  * Made the input a hex string so input_length isn't needed

+    WebCryptoAlgorithmId algorithm;
+    const std::string hex_input;
+    const char* hex_result;
+  };
+
+  const TestCase kTests[] = {
+    { WebCryptoAlgorithmIdSha1, "",
+      "da39a3ee5e6b4b0d3255bfef95601890afd80709"
     },
-    {
-      "\000", 1,
-      {
-        // echo -n -e "\000" | sha1sum
-        "5ba93c9db0cff93f52b521d7420e43f6eda2784f",
-        // echo -n -e "\000" | sha224sum
-        "fff9292b4201617bdc4d3053fce02734166a683d7d858a7f5f59b073",
-        // echo -n -e "\000" | sha256sum
-        "6e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d",
-        // echo -n -e "\000" | sha384sum
-        "bec021b4f368e3069134e012c2b4307083d3a9bdd206e24e5f0d86e13d6636655933"
-        "ec2b413465966817a9c208a11717",
-        // echo -n -e "\000" | sha512sum
-        "b8244d028981d693af7b456af8efa4cad63d282e19ff14942c246e50d9351d22704a"
-        "802a71c3580b6370de4ceb293c324a8423342557d4e5c38438f0e36910ee",
-      },
+    { WebCryptoAlgorithmIdSha224, "",
+      "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f"
     },
-    {
-      "\000\001\002\003\004\005", 6,
-      {
-        // echo -n -e "\000\001\002\003\004\005" | sha1sum
-        "868460d98d09d8bbb93d7b6cdd15cc7fbec676b9",
-        // echo -n -e "\000\001\002\003\004\005" | sha224sum
-        "7d92e7f1cad1818ed1d13ab41f04ebabfe1fef6bb4cbeebac34c29bc",
-        // echo -n -e "\000\001\002\003\004\005" | sha256sum
-        "17e88db187afd62c16e5debf3e6527cd006bc012bc90b51a810cd80c2d511f43",
-        // echo -n -e "\000\001\002\003\004\005" | sha384sum
-        "79f4738706fce9650ac60266675c3cd07298b09923850d525604d040e6e448adc7dc"
-        "22780d7e1b95bfeaa86a678e4552",
-        // echo -n -e "\000\001\002\003\004\005" | sha512sum
-        "2f3831bccc94cf061bcfa5f8c23c1429d26e3bc6b76edad93d9025cb91c903af6cf9"
-        "c935dc37193c04c2c66e7d9de17c358284418218afea2160147aaa912f4c",
-      },
+    { WebCryptoAlgorithmIdSha256, "",
+      "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    },
+    { WebCryptoAlgorithmIdSha384, "",
+      "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274e"
+      "debfe76f65fbd51ad2f14898b95b"
+    },
+    { WebCryptoAlgorithmIdSha512, "",
+      "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0"
+      "d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
+    },
+    { WebCryptoAlgorithmIdSha1, "00",
+      "5ba93c9db0cff93f52b521d7420e43f6eda2784f",
+    },
+    { WebCryptoAlgorithmIdSha224, "00",
+      "fff9292b4201617bdc4d3053fce02734166a683d7d858a7f5f59b073",
+    },
+    { WebCryptoAlgorithmIdSha256, "00",
+      "6e340b9cffb37a989ca544e6bb780a2c78901d3fb33738768511a30617afa01d",
+    },
+    { WebCryptoAlgorithmIdSha384, "00",
+      "bec021b4f368e3069134e012c2b4307083d3a9bdd206e24e5f0d86e13d6636655933"
+      "ec2b413465966817a9c208a11717",
+    },
+    { WebCryptoAlgorithmIdSha512, "00",
+      "b8244d028981d693af7b456af8efa4cad63d282e19ff14942c246e50d9351d22704a"
+      "802a71c3580b6370de4ceb293c324a8423342557d4e5c38438f0e36910ee",
+    },
+    { WebCryptoAlgorithmIdSha1, "000102030405",
+      "868460d98d09d8bbb93d7b6cdd15cc7fbec676b9",
+    },
+    { WebCryptoAlgorithmIdSha224, "000102030405",
+      "7d92e7f1cad1818ed1d13ab41f04ebabfe1fef6bb4cbeebac34c29bc",
+    },
+    { WebCryptoAlgorithmIdSha256, "000102030405",
+      "17e88db187afd62c16e5debf3e6527cd006bc012bc90b51a810cd80c2d511f43",
+    },
+    { WebCryptoAlgorithmIdSha384, "000102030405",
+      "79f4738706fce9650ac60266675c3cd07298b09923850d525604d040e6e448adc7dc"
+      "22780d7e1b95bfeaa86a678e4552",
+    },
+    { WebCryptoAlgorithmIdSha512, "000102030405",
+      "2f3831bccc94cf061bcfa5f8c23c1429d26e3bc6b76edad93d9025cb91c903af6cf9"
+      "c935dc37193c04c2c66e7d9de17c358284418218afea2160147aaa912f4c",
     },
   };
 
-  for (size_t id_index = 0; id_index < arraysize(kAlgorithmIds); id_index++) {
-    SCOPED_TRACE(id_index);
-
-    WebKit::WebCryptoAlgorithm algorithm(
-        WebKit::WebCryptoAlgorithm::adoptParamsAndCreate(
-            kAlgorithmIds[id_index], NULL));
-
-    for (size_t set_index = 0;
-         set_index < ARRAYSIZE_UNSAFE(input_set);
-         set_index++) {
-      SCOPED_TRACE(set_index);
+  for (size_t test_index = 0; test_index < arraysize(kTests); test_index++) {
+    SCOPED_TRACE(test_index);
+    const TestCase& test = kTests[test_index];
 
-      WebKit::WebArrayBuffer array_buffer;
+    WebCryptoAlgorithm algorithm = CreateAlgorithm(test.algorithm);
+    std::vector<uint8> input = HexStringToBytes(test.hex_input);
 
-      WebCryptoImpl crypto;
-      EXPECT_TRUE(
-          crypto.DigestInternal(
-              algorithm,
-              reinterpret_cast<const unsigned char*>(
-                  input_set[set_index].input),
-              input_set[set_index].input_length,
-              &array_buffer));
-
-      // Ignore case, it's checking the hex value.
-      EXPECT_STRCASEEQ(
-          input_set[set_index].hex_result[id_index],
-          base::HexEncode(
-              array_buffer.data(), array_buffer.byteLength()).c_str());
-    }
+    WebArrayBuffer output;
+    EXPECT_TRUE(DigestInternal(algorithm, input.data(), input.size(), &output));
+    ExpectArrayBufferMatchesHex(test.hex_result, output);
   }
 }
 
 TEST_F(WebCryptoImplTest, HMACSampleSets) {
-  struct {
-    WebKit::WebCryptoAlgorithmId algorithm;
+  struct TestCase {
+    WebCryptoAlgorithmId algorithm;
     const char* key;
     const char* message;
     const char* mac;
-  } input_set[] = {
+  };
+
+  const TestCase kTests[] = {
     // Empty sets.  Result generated via OpenSSL commandline tool.  These
     // particular results are also posted on the Wikipedia page examples:
     // http://en.wikipedia.org/wiki/Hash-based_message_authentication_code
     {
-      WebKit::WebCryptoAlgorithmIdSha1,
+      WebCryptoAlgorithmIdSha1,
       "",
       "",
       // openssl dgst -sha1 -hmac "" < /dev/null
       "fbdb1d1b18aa6c08324b7d64b71fb76370690e1d",
     },
     {
-      WebKit::WebCryptoAlgorithmIdSha256,
+      WebCryptoAlgorithmIdSha256,
       "",
       "",
       // openssl dgst -sha256 -hmac "" < /dev/null
@@ -153,7 +188,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) {
     // http://csrc.nist.gov/groups/STM/cavp/documents/mac/hmactestvectors.zip
     // L=20 set 45
     {
-      WebKit::WebCryptoAlgorithmIdSha1,
+      WebCryptoAlgorithmIdSha1,
       // key
       "59785928d72516e31272",
       // message
@@ -166,7 +201,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) {
     },
     // L=20 set 299
     {
-      WebKit::WebCryptoAlgorithmIdSha1,
+      WebCryptoAlgorithmIdSha1,
       // key
       "ceb9aedf8d6efcf0ae52bea0fa99a9e26ae81bacea0cff4d5eecf201e3bca3c3577480"
       "621b818fd717ba99d6ff958ea3d59b2527b019c343bb199e648090225867d994607962"
@@ -181,7 +216,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) {
     },
     // L=32, set 30
     {
-      WebKit::WebCryptoAlgorithmIdSha256,
+      WebCryptoAlgorithmIdSha256,
       // key
       "9779d9120642797f1747025d5b22b7ac607cab08e1758f2f3a46c8be1e25c53b8c6a8f"
       "58ffefa176",
@@ -195,7 +230,7 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) {
     },
     // L=32, set 224
     {
-      WebKit::WebCryptoAlgorithmIdSha256,
+      WebCryptoAlgorithmIdSha256,
       // key
       "4b7ab133efe99e02fc89a28409ee187d579e774f4cba6fc223e13504e3511bef8d4f63"
       "8b9aca55d4a43b8fbd64cf9d74dcc8c9e8d52034898c70264ea911a3fd70813fa73b08"
@@ -210,67 +245,23 @@ TEST_F(WebCryptoImplTest, HMACSampleSets) {
     },
   };
 
-  for (size_t index = 0; index < ARRAYSIZE_UNSAFE(input_set); index++) {
-    SCOPED_TRACE(index);
-
-    WebKit::WebCryptoAlgorithm hash_algorithm(
-        WebKit::WebCryptoAlgorithm::adoptParamsAndCreate(
-            input_set[index].algorithm, NULL));
-
-    scoped_ptr<WebKit::WebCryptoHmacParams> hmac_params(
-        new WebKit::WebCryptoHmacParams(hash_algorithm));
-
-    WebKit::WebCryptoAlgorithm hmac_algorithm(
-        WebKit::WebCryptoAlgorithm::adoptParamsAndCreate(
-            WebKit::WebCryptoAlgorithmIdHmac, hmac_params.release()));
-
-    WebKit::WebCryptoKeyType type;
-    scoped_ptr<WebKit::WebCryptoKeyHandle> handle;
+  for (size_t test_index = 0; test_index < arraysize(kTests); test_index++) {
+    SCOPED_TRACE(test_index);
+    const TestCase& test = kTests[test_index];
 
-    std::vector<uint8> key_raw;
-    base::HexStringToBytes(input_set[index].key, &key_raw);
+    WebCryptoAlgorithm algorithm = CreateHmacAlgorithm(test.algorithm);
 
-    WebCryptoImpl crypto;
+    WebCryptoKey key = ImportSecretKeyFromRawHexString(
+        test.key, algorithm, WebCryptoKeyUsageSign);
 
-    EXPECT_TRUE(
-        crypto.ImportKeyInternal(
-            WebKit::WebCryptoKeyFormatRaw,
-            key_raw.data(),
-            key_raw.size(),
-            hmac_algorithm,
-            WebKit::WebCryptoKeyUsageSign,
-            &handle,
-            &type));
+    std::vector<uint8> message_raw = HexStringToBytes(test.message);
 
-    EXPECT_EQ(WebKit::WebCryptoKeyTypeSecret, type);
-    ASSERT_TRUE(handle.get());
+    WebArrayBuffer output;
 
-    WebKit::WebCryptoKey crypto_key =
-        WebKit::WebCryptoKey::create(
-            handle.release(),
-            type,
-            false,
-            hmac_algorithm,
-            WebKit::WebCryptoKeyUsageSign);
+    EXPECT_TRUE(SignInternal(
+        algorithm, key, message_raw.data(), message_raw.size(), &output));
 
-    std::vector<uint8> message_raw;
-    base::HexStringToBytes(input_set[index].message, &message_raw);
-
-    WebKit::WebArrayBuffer array_buffer;
-
-    EXPECT_TRUE(
-        crypto.SignInternal(
-            hmac_algorithm,
-            crypto_key,
-            message_raw.data(),
-            message_raw.size(),
-            &array_buffer));
-
-    // Ignore case, it's checking the hex value.
-    EXPECT_STRCASEEQ(
-        input_set[index].mac,
-        base::HexEncode(
-            array_buffer.data(), array_buffer.byteLength()).c_str());
+    ExpectArrayBufferMatchesHex(test.mac, output);
   }
 }