| Index: net/cert/ct_serialization_unittest.cc
|
| diff --git a/net/cert/ct_serialization_unittest.cc b/net/cert/ct_serialization_unittest.cc
|
| index 934cdb38a6000b138befbda0750485662b734a65..cecb7b4b54a94941b42f653ea5f770d5934de1a9 100644
|
| --- a/net/cert/ct_serialization_unittest.cc
|
| +++ b/net/cert/ct_serialization_unittest.cc
|
| @@ -33,25 +33,18 @@ TEST_F(CtSerializationTest, DecodesDigitallySigned) {
|
| ct::DigitallySigned parsed;
|
|
|
| ASSERT_TRUE(ct::DecodeDigitallySigned(&digitally_signed, &parsed));
|
| - EXPECT_EQ(
|
| - ct::DigitallySigned::HASH_ALGO_SHA256,
|
| - parsed.hash_algorithm);
|
| + EXPECT_EQ(ct::DigitallySigned::HASH_ALGO_SHA256, parsed.hash_algorithm);
|
|
|
| - EXPECT_EQ(
|
| - ct::DigitallySigned::SIG_ALGO_ECDSA,
|
| - parsed.signature_algorithm);
|
| + EXPECT_EQ(ct::DigitallySigned::SIG_ALGO_ECDSA, parsed.signature_algorithm);
|
|
|
| // The encoded data contains the signature itself from the 4th byte.
|
| // The first bytes are:
|
| // 1 byte of hash algorithm
|
| // 1 byte of signature algorithm
|
| // 2 bytes - prefix containing length of the signature data.
|
| - EXPECT_EQ(
|
| - test_digitally_signed_.substr(4),
|
| - parsed.signature_data);
|
| + EXPECT_EQ(test_digitally_signed_.substr(4), parsed.signature_data);
|
| }
|
|
|
| -
|
| TEST_F(CtSerializationTest, FailsToDecodePartialDigitallySigned) {
|
| base::StringPiece digitally_signed(test_digitally_signed_);
|
| base::StringPiece partial_digitally_signed(
|
| @@ -61,7 +54,6 @@ TEST_F(CtSerializationTest, FailsToDecodePartialDigitallySigned) {
|
| ASSERT_FALSE(ct::DecodeDigitallySigned(&partial_digitally_signed, &parsed));
|
| }
|
|
|
| -
|
| TEST_F(CtSerializationTest, EncodesDigitallySigned) {
|
| ct::DigitallySigned digitally_signed;
|
| digitally_signed.hash_algorithm = ct::DigitallySigned::HASH_ALGO_SHA256;
|
| @@ -74,7 +66,6 @@ TEST_F(CtSerializationTest, EncodesDigitallySigned) {
|
| EXPECT_EQ(test_digitally_signed_, encoded);
|
| }
|
|
|
| -
|
| TEST_F(CtSerializationTest, EncodesLogEntryForX509Cert) {
|
| ct::LogEntry entry;
|
| GetX509CertLogEntry(&entry);
|
| @@ -92,22 +83,19 @@ TEST_F(CtSerializationTest, EncodesLogEntryForX509Cert) {
|
|
|
| TEST_F(CtSerializationTest, EncodesV1SCTSignedData) {
|
| base::Time timestamp = base::Time::UnixEpoch() +
|
| - base::TimeDelta::FromMilliseconds(1348589665525);
|
| + base::TimeDelta::FromMilliseconds(1348589665525);
|
| std::string dummy_entry("abc");
|
| std::string empty_extensions;
|
| // For now, no known failure cases.
|
| std::string encoded;
|
| ASSERT_TRUE(ct::EncodeV1SCTSignedData(
|
| - timestamp,
|
| - dummy_entry,
|
| - empty_extensions,
|
| - &encoded));
|
| - EXPECT_EQ((size_t) 15, encoded.size());
|
| + timestamp, dummy_entry, empty_extensions, &encoded));
|
| + EXPECT_EQ((size_t)15, encoded.size());
|
| // Byte 0 is version, byte 1 is signature type
|
| // Bytes 2-10 are timestamp
|
| // Bytes 11-14 are the log signature
|
| // Byte 15 is the empty extension
|
| - //EXPECT_EQ(0, timestamp.ToTimeT());
|
| + // EXPECT_EQ(0, timestamp.ToTimeT());
|
| std::string expected_buffer(
|
| "\x0\x0\x0\x0\x1\x39\xFE\x35\x3C\xF5\x61\x62\x63\x0\x0", 15);
|
| EXPECT_EQ(expected_buffer, encoded);
|
| @@ -140,11 +128,11 @@ TEST_F(CtSerializationTest, DecodesSignedCertificateTimestamp) {
|
| EXPECT_EQ(0, sct->version);
|
| EXPECT_EQ(ct::GetTestPublicKeyId(), sct->log_id);
|
| base::Time expected_time = base::Time::UnixEpoch() +
|
| - base::TimeDelta::FromMilliseconds(1365181456089);
|
| + base::TimeDelta::FromMilliseconds(1365181456089);
|
| EXPECT_EQ(expected_time, sct->timestamp);
|
| // Subtracting 4 bytes for signature data (hash & sig algs),
|
| // actual signature data should be 71 bytes.
|
| - EXPECT_EQ((size_t) 71, sct->signature.signature_data.size());
|
| + EXPECT_EQ((size_t)71, sct->signature.signature_data.size());
|
| EXPECT_TRUE(sct->extensions.empty());
|
| }
|
|
|
| @@ -158,9 +146,7 @@ TEST_F(CtSerializationTest, FailsDecodingInvalidSignedCertificateTimestamp) {
|
|
|
| // Valid version, invalid length (missing data)
|
| base::StringPiece invalid_length_sct("\x0\xa\xb\xc", 4);
|
| - ASSERT_FALSE(
|
| - ct::DecodeSignedCertificateTimestamp(&invalid_length_sct, &sct));
|
| + ASSERT_FALSE(ct::DecodeSignedCertificateTimestamp(&invalid_length_sct, &sct));
|
| }
|
|
|
| } // namespace net
|
| -
|
|
|