replaced x509 with namespace on the client-side

1 files changed, 32 insertions, 7 deletions

diff --git a/client/get-proof-by-hash/main.go b/client/get-proof-by-hash/main.go
index 964bcda..00a4486 100644
--- a/client/get-proof-by-hash/main.go
+++ b/client/get-proof-by-hash/main.go
@@ -11,34 +11,43 @@ import (
 	"github.com/golang/glog"
 	"github.com/system-transparency/stfe"
 	"github.com/system-transparency/stfe/client"
+	"github.com/system-transparency/stfe/descriptor"
 )
 
 var (
 	operators      = flag.String("operators", "../../descriptor/stfe.json", "path to json-encoded list of log operators")
-	logId          = flag.String("log_id", "B9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPM=", "base64-encoded log identifier")
-	signedTreeHead = flag.String("sth", "AAEgB9oCJk4XIOMXba8dBM5yUj+NLtqTE6xHwbvR9dYkHPMAAAF1jnn7fwAAAAAAAAAxICCqLJn4QWYd0aRIRjDWGf4GWalDIb/iH60jSSX89WgvAAAAQF9XPFRdM56KaelHFFg1RqjTw1yFL085zHhdNkLeZh9BCXxVTByqrHEMngAkY69EX45aJMWh9NymmPau0qoigA8=", "base64-encoded StItem of type StFormatSignedTreeHeadV1")
-	entry          = flag.String("entry", "AAUBOCAsYkIyzdIhdxKU37sxCsoACg32rItmtpbZDvBv3vtkow==", "base64-encoded StItem of type StFormatChecksumV1")
+	logId          = flag.String("log_id", "AAEgFKl1V+J3ib3Aav86UgGD7GRRtcKIdDhgc0G4vVD/TGc=", "base64-encoded log identifier")
+	signedTreeHead = flag.String("sth", "AAEjAAEgFKl1V+J3ib3Aav86UgGD7GRRtcKIdDhgc0G4vVD/TGcAAAF3Ts1DPAAAAAAAAACKIOjuyYlimCylCNmIliPWn+O+oOPpvdtllbJnp+xKV3qhAAAAQKW2+4+3a2cgERULDrbwoeevo6q1JxY8mcj73XPLAhcmlR/YmtuWv6PEJYiLP/bclN6ZQ5ttQq1/9hG+VvgLvA4=", "base64-encoded StItem of type StFormatSignedTreeHeadV1")
+	entry          = flag.String("entry", "AAUFZGViaTYw50e7967bce266a506f8f614bb5096beba580d205046b918f47d23b2ec626d75eAAEgHOQFUkKNWpjYAhNKTyWCzahlI7RDtf5123kHD2LACj0=", "base64-encoded StItem of type StFormatChecksumV1")
 )
 
 func main() {
 	flag.Parse()
 
-	cli, err := client.NewClientFromPath(*logId, "", "", *operators, &http.Client{}, true)
+	cli, err := client.NewClient(mustLoad(*operators, *logId), &http.Client{}, true, nil)
 	if err != nil {
 		glog.Fatal(err)
 	}
+	ns, err := cli.Log.Namespace()
+	if err != nil {
+		glog.Fatalf("bad log namespace: %v", err)
+	}
 
+	// Check STH
 	var sth stfe.StItem
 	if err := sth.UnmarshalB64(*signedTreeHead); err != nil {
 		glog.Fatalf("bad signed tree head: %v", err)
 	}
-	if k, err := cli.Log.Key(); err != nil {
-		glog.Fatalf("bad public key: %v", err)
-	} else if err := client.VerifySignedTreeHeadV1(&sth, cli.Log.Scheme, k); err != nil {
+	th, err := sth.SignedTreeHeadV1.TreeHead.Marshal()
+	if err != nil {
+		glog.Fatalf("cannot marshal tree head: %v", err)
+	}
+	if err := ns.Verify(th, sth.SignedTreeHeadV1.Signature); err != nil {
 		glog.Fatalf("bad signed tree head: %v", err)
 	}
 	glog.V(3).Info("verified sth")
 
+	// Check inclusion
 	leaf, err := base64.StdEncoding.DecodeString(*entry)
 	if err != nil {
 		glog.Fatalf("failed decoding entry: %v", err)
@@ -57,3 +66,19 @@ func main() {
 
 	glog.Flush()
 }
+
+func mustLoad(operators, logId string) *descriptor.Log {
+	ops, err := descriptor.LoadOperators(operators)
+	if err != nil {
+		glog.Fatalf("failed loading log operators: %v")
+	}
+	id, err := base64.StdEncoding.DecodeString(logId)
+	if err != nil {
+		glog.Fatalf("invalid base64 log id: %v", err)
+	}
+	log, err := descriptor.FindLog(ops, id)
+	if err != nil {
+		glog.Fatalf("unknown log id: %v", err)
+	}
+	return log
+}