From db0ad049b165c254d9561ea0767efd2bf2fb207c Mon Sep 17 00:00:00 2001
From: Maximilian Pohl <maximilian@tweedegolf.com>
Date: Thu, 19 Sep 2024 09:49:41 +0200
Subject: [PATCH] Adopt to davidben/merkle-tree-certs#91

---
 mtc.go | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/mtc.go b/mtc.go
index c5173a9..206fe63 100644
--- a/mtc.go
+++ b/mtc.go
@@ -1025,12 +1025,14 @@ func (batch *Batch) hashNode(out, left, right []byte, index uint64,
 	var b cryptobyte.Builder
 
 	b.AddUint8(1)
-	var issuer, err = batch.CA.Issuer.MarashalBinary()
+	tai, err := TrustAnchorIdentifier{
+		Issuer:      batch.CA.Issuer,
+		BatchNumber: batch.Number,
+	}.MarshalBinary()
 	if err != nil {
-		return nil
+		return err
 	}
-	b.AddBytes(issuer)
-	b.AddUint32(batch.Number)
+	b.AddBytes(tai)
 	b.AddUint64(index)
 	b.AddUint8(level)
 	b.AddBytes(left)
@@ -1050,12 +1052,14 @@ func (batch *Batch) hashNode(out, left, right []byte, index uint64,
 func (batch *Batch) hashEmpty(out []byte, index uint64, level uint8) error {
 	var b cryptobyte.Builder
 	b.AddUint8(0)
-	var issuer, err = batch.CA.Issuer.MarashalBinary()
+	tai, err := TrustAnchorIdentifier{
+		Issuer:      batch.CA.Issuer,
+		BatchNumber: batch.Number,
+	}.MarshalBinary()
 	if err != nil {
 		return err
 	}
-	b.AddBytes(issuer)
-	b.AddUint32(batch.Number)
+	b.AddBytes(tai)
 	b.AddUint64(index)
 	b.AddUint8(level)
 	buf, err := b.Bytes()
@@ -1144,12 +1148,14 @@ func (a *AbridgedAssertion) Key(out []byte) error {
 func (a *AbridgedAssertion) Hash(out []byte, batch *Batch, index uint64) error {
 	var b cryptobyte.Builder
 	b.AddUint8(2)
-	var issuer, err = batch.CA.Issuer.MarashalBinary()
+	tai, err := TrustAnchorIdentifier{
+		Issuer:      batch.CA.Issuer,
+		BatchNumber: batch.Number,
+	}.MarshalBinary()
 	if err != nil {
-		return nil
+		return err
 	}
-	b.AddBytes(issuer)
-	b.AddUint32(batch.Number)
+	b.AddBytes(tai)
 	b.AddUint64(index)
 	buf, err := a.MarshalBinary()
 	if err != nil {