Update monet.

net/cert/jwk_serializer_unittest.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 "net/cert/jwk_serializer.h"
 
 #include "base/base64.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 // This is the ASN.1 prefix for a P-256 public key. Specifically it's:
 // SEQUENCE
 //   SEQUENCE
 //     OID id-ecPublicKey
 //     OID prime256v1
 //   BIT STRING, length 66, 0 trailing bits: 0x04
 //
 // The 0x04 in the BIT STRING is the prefix for an uncompressed, X9.62
 // public key. Following that are the two field elements as 32-byte,
 // big-endian numbers, as required by the Channel ID.
-static const unsigned char kP256SpkiPrefix[] = {
-    0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
-    0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a,
-    0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
-    0x42, 0x00, 0x04
-};
+// static const unsigned char kP256SpkiPrefix[] = {
+//    0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
+//    0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a,
+//    0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
+//    0x42, 0x00, 0x04
+//};
+static const unsigned int kP256SpkiPrefixSize = 27U;
 static const unsigned int kEcCoordinateSize = 32U;
 
 // This is a valid P-256 public key.
 static const unsigned char kSpkiEc[] = {
     0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
     0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a,
     0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
     0x42, 0x00, 0x04,
     0x29, 0x5d, 0x6e, 0xfe, 0x33, 0x77, 0x26, 0xea,
     0x5b, 0xa4, 0xe6, 0x1b, 0x34, 0x6e, 0x7b, 0xa0,
@@ skipping 35 matching lines @@
   std::string string_value;
   EXPECT_TRUE(public_key_jwk.GetString("kty", &string_value));
   EXPECT_STREQ("EC", string_value.c_str());
   EXPECT_TRUE(public_key_jwk.GetString("crv", &string_value));
   EXPECT_STREQ("P-256", string_value.c_str());
 
   EXPECT_TRUE(public_key_jwk.GetString("x", &string_value));
   std::string decoded_coordinate;
   EXPECT_TRUE(base::Base64Decode(string_value, &decoded_coordinate));
   EXPECT_EQ(kEcCoordinateSize, decoded_coordinate.size());
-  EXPECT_EQ(0,
-            memcmp(decoded_coordinate.data(),
-                   kSpkiEc + sizeof(kP256SpkiPrefix),
-                   kEcCoordinateSize));
+  EXPECT_EQ(0, memcmp(decoded_coordinate.data(), kSpkiEc + kP256SpkiPrefixSize,
+                      kEcCoordinateSize));
 
   EXPECT_TRUE(public_key_jwk.GetString("y", &string_value));
   EXPECT_TRUE(base::Base64Decode(string_value, &decoded_coordinate));
   EXPECT_EQ(kEcCoordinateSize, decoded_coordinate.size());
-  EXPECT_EQ(0,
-            memcmp(decoded_coordinate.data(),
-                  kSpkiEc + sizeof(kP256SpkiPrefix) + kEcCoordinateSize,
-                  kEcCoordinateSize));
+  EXPECT_EQ(0, memcmp(decoded_coordinate.data(),
+                      kSpkiEc + kP256SpkiPrefixSize + kEcCoordinateSize,
+                      kEcCoordinateSize));
 
   // Test the result of a corner case: leading 0s in the x, y coordinates are
   // not trimmed, but the point is fixed-length encoded.
   spki.set(reinterpret_cast<const char*>(kSpkiEcWithLeadingZero),
            sizeof(kSpkiEcWithLeadingZero));
   EXPECT_TRUE(JwkSerializer::ConvertSpkiFromDerToJwk(spki, &public_key_jwk));
 
   EXPECT_TRUE(public_key_jwk.GetString("kty", &string_value));
   EXPECT_STREQ("EC", string_value.c_str());
   EXPECT_TRUE(public_key_jwk.GetString("crv", &string_value));
   EXPECT_STREQ("P-256", string_value.c_str());
 
   EXPECT_TRUE(public_key_jwk.GetString("x", &string_value));
   EXPECT_TRUE(base::Base64Decode(string_value, &decoded_coordinate));
   EXPECT_EQ(kEcCoordinateSize, decoded_coordinate.size());
-  EXPECT_EQ(0,
-            memcmp(decoded_coordinate.data(),
-                   kSpkiEcWithLeadingZero + sizeof(kP256SpkiPrefix),
-                   kEcCoordinateSize));
+  EXPECT_EQ(0, memcmp(decoded_coordinate.data(),
+                      kSpkiEcWithLeadingZero + kP256SpkiPrefixSize,
+                      kEcCoordinateSize));
 
   EXPECT_TRUE(public_key_jwk.GetString("y", &string_value));
   EXPECT_TRUE(base::Base64Decode(string_value, &decoded_coordinate));
   EXPECT_EQ(kEcCoordinateSize, decoded_coordinate.size());
-  EXPECT_EQ(0, memcmp(
-      decoded_coordinate.data(),
-      kSpkiEcWithLeadingZero + sizeof(kP256SpkiPrefix) + kEcCoordinateSize,
-      kEcCoordinateSize));
+  EXPECT_EQ(0, memcmp(decoded_coordinate.data(),
+                      kSpkiEcWithLeadingZero + kP256SpkiPrefixSize +
+                          kEcCoordinateSize,
+                      kEcCoordinateSize));
 }
 
 }  // namespace net