Certificate Transparency: MerkleTreeLeaf, MerkleAuditProof improvements.

net/cert/merkle_tree_leaf_unittest.cc

 // Copyright 2016 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/merkle_tree_leaf.h"
 
 #include <string.h>
 
 #include <string>
 
@@ skipping 57 matching lines @@
   scoped_refptr<SignedCertificateTimestamp> x509_sct_;
   scoped_refptr<SignedCertificateTimestamp> precert_sct_;
   scoped_refptr<X509Certificate> test_cert_;
   scoped_refptr<X509Certificate> test_precert_;
 };
 
 TEST_F(MerkleTreeLeafTest, CreatesForX509Cert) {
   MerkleTreeLeaf leaf;
   ASSERT_TRUE(GetMerkleTreeLeaf(test_cert_.get(), x509_sct_.get(), &leaf));
 
-  EXPECT_EQ(x509_sct_->log_id, leaf.log_id);
   EXPECT_EQ(LogEntry::LOG_ENTRY_TYPE_X509, leaf.log_entry.type);
   EXPECT_FALSE(leaf.log_entry.leaf_certificate.empty());
   EXPECT_TRUE(leaf.log_entry.tbs_certificate.empty());
 
   EXPECT_EQ(x509_sct_->timestamp, leaf.timestamp);
   EXPECT_EQ(x509_sct_->extensions, leaf.extensions);
 }
 
 TEST_F(MerkleTreeLeafTest, CreatesForPrecert) {
   MerkleTreeLeaf leaf;
   ASSERT_TRUE(
       GetMerkleTreeLeaf(test_precert_.get(), precert_sct_.get(), &leaf));
 
-  EXPECT_EQ(precert_sct_->log_id, leaf.log_id);
   EXPECT_EQ(LogEntry::LOG_ENTRY_TYPE_PRECERT, leaf.log_entry.type);
   EXPECT_FALSE(leaf.log_entry.tbs_certificate.empty());
   EXPECT_TRUE(leaf.log_entry.leaf_certificate.empty());
 
   EXPECT_EQ(precert_sct_->timestamp, leaf.timestamp);
   EXPECT_EQ(precert_sct_->extensions, leaf.extensions);
 }
 
 TEST_F(MerkleTreeLeafTest, DoesNotCreateForEmbeddedSCTButNotPrecert) {
   MerkleTreeLeaf leaf;
   ASSERT_FALSE(GetMerkleTreeLeaf(test_cert_.get(), precert_sct_.get(), &leaf));
 }
 
 // Expected hashes calculated by:
 // 1. Writing the serialized tree leaves from
 //    CtSerialization::EncodesLogEntryFor{X509Cert,Precert} to files.
 // 2. Prepending a zero byte to both files.
 // 3. Passing each file through the sha256sum tool.
 
 TEST_F(MerkleTreeLeafTest, HashForX509Cert) {
   MerkleTreeLeaf leaf;
   ct::GetX509CertTreeLeaf(&leaf);
 
   std::string hash;
-  ASSERT_TRUE(Hash(leaf, &hash));
+  ASSERT_TRUE(HashMerkleTreeLeaf(leaf, &hash));
   EXPECT_THAT(hash, HexEq("452da788b3b8d15872ff0bb0777354b2a7f1c1887b5633201e76"
                           "2ba5a4b143fc"));
 }
 
 TEST_F(MerkleTreeLeafTest, HashForPrecert) {
   MerkleTreeLeaf leaf;
   ct::GetPrecertTreeLeaf(&leaf);
 
   std::string hash;
-  ASSERT_TRUE(Hash(leaf, &hash));
+  ASSERT_TRUE(HashMerkleTreeLeaf(leaf, &hash));
   EXPECT_THAT(hash, HexEq("257ae85f08810445511e35e33f7aee99ee19407971e35e95822b"
                           "bf42a74be223"));
 }
 
 }  // namespace
 
 }  // namespace ct
 
 }  // namespace net