From 5396e1c38b4defc25962c1d0412e6c95e98233f9 Mon Sep 17 00:00:00 2001
From: Cody Soyland <codysoyland@github.com>
Date: Fri, 22 Mar 2024 15:55:27 -0400
Subject: [PATCH] Couple of fixes

Signed-off-by: Cody Soyland <codysoyland@github.com>
---
 hack/gentestdata/gentestdata.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/hack/gentestdata/gentestdata.go b/hack/gentestdata/gentestdata.go
index 5001908c..29c54646 100644
--- a/hack/gentestdata/gentestdata.go
+++ b/hack/gentestdata/gentestdata.go
@@ -184,14 +184,14 @@ func populateLogIDs(sigstoreKeys *config.SigstoreKeys) error {
 		if err != nil {
 			return err
 		}
-		sigstoreKeys.Tlogs[i].LogId = &config.LogId{KeyId: []byte(logID)}
+		sigstoreKeys.Tlogs[i].LogId = &config.LogID{KeyId: []byte(logID)}
 	}
 	for i := range sigstoreKeys.Ctlogs {
 		logID, err := genLogID(sigstoreKeys.Ctlogs[i].PublicKey.RawBytes)
 		if err != nil {
 			return err
 		}
-		sigstoreKeys.Ctlogs[i].LogId = &config.LogId{KeyId: []byte(logID)}
+		sigstoreKeys.Ctlogs[i].LogId = &config.LogID{KeyId: []byte(logID)}
 	}
 	return nil
 }
@@ -230,6 +230,15 @@ func genTUFRepo(sigstoreKeysMap map[string]string) ([]byte, []byte, []byte, erro
 		return nil, nil, nil, err
 	}
 
+	tlogKey, _, err := config.DeserializePublicKey([]byte(sigstoreKeysMap["rekor"]))
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	ctlogKey, _, err := config.DeserializePublicKey([]byte(sigstoreKeysMap["ctfe"]))
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
 	trustRoot := &config.SigstoreKeys{
 		CertificateAuthorities: []*config.CertificateAuthority{{
 			CertChain: config.DeserializeCertChain([]byte(sigstoreKeysMap["fulcio"])),
@@ -239,11 +248,11 @@ func genTUFRepo(sigstoreKeysMap map[string]string) ([]byte, []byte, []byte, erro
 		}},
 		Tlogs: []*config.TransparencyLogInstance{{
 			HashAlgorithm: pbcommon.HashAlgorithm_SHA2_256,
-			PublicKey:     config.DeserializePublicKey([]byte(sigstoreKeysMap["rekor"])),
+			PublicKey:     tlogKey,
 		}},
 		Ctlogs: []*config.TransparencyLogInstance{{
 			HashAlgorithm: pbcommon.HashAlgorithm_SHA2_256,
-			PublicKey:     config.DeserializePublicKey([]byte(sigstoreKeysMap["ctfe"])),
+			PublicKey:     ctlogKey,
 		}},
 	}
 	err = populateLogIDs(trustRoot)