From f7d2c65559a5149e4923554695a99540abdcc56f Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 23 Mar 2022 09:12:26 +0100 Subject: follow SSHSIG changes in lib --- pkg/client/submitter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/client') diff --git a/pkg/client/submitter.go b/pkg/client/submitter.go index f03e66a..21c9258 100644 --- a/pkg/client/submitter.go +++ b/pkg/client/submitter.go @@ -73,9 +73,9 @@ func (sc *SubmitClient) AddLeaves(_ context.Context, leaves []requests.Leaf) ([] bundles = nil for _, leaf := range leaves { l := types.Leaf{ - Statement: types.Statement{ + SignedData: types.SignedData{ ShardHint: leaf.ShardHint, - Checksum: leaf.Checksum, + Checksum: *types.HashFn(leaf.Preimage[:]), }, Signature: leaf.Signature, KeyHash: *types.HashFn(leaf.VerificationKey[:]), -- cgit v1.2.3 From ee322c9e18b9675aab08f4c9f38f6be19b1d6890 Mon Sep 17 00:00:00 2001 From: Rasmus Dahlberg Date: Wed, 13 Apr 2022 15:04:44 +0200 Subject: minor edits to make sshsig stuff compile --- cmd/sigsum/cmd.go | 4 ++-- go.mod | 2 +- go.sum | 2 ++ pkg/client/submitter.go | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'pkg/client') diff --git a/cmd/sigsum/cmd.go b/cmd/sigsum/cmd.go index fc2274e..69598d5 100644 --- a/cmd/sigsum/cmd.go +++ b/cmd/sigsum/cmd.go @@ -73,7 +73,7 @@ func cmdBundle(args []string, policy policy.Policy, optBundleType, optBundleKey, DomainHint: optBundleDomainHint, } - sd := types.SignedData{ + sd := types.Statement{ ShardHint: req.ShardHint, Checksum: *types.HashFn(req.Preimage[:]), } @@ -106,7 +106,7 @@ func cmdFormat(args []string, policy policy.Policy) error { if err != nil { return fmt.Errorf("format: %v", err) } - sd := types.SignedData{ + sd := types.Statement{ ShardHint: policy.ShardHint(), Checksum: *types.HashFn(preimage[:]), } diff --git a/go.mod b/go.mod index 4b09be4..034a726 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module git.sigsum.org/sigsum-tool-go go 1.15 require ( - git.sigsum.org/sigsum-lib-go v0.0.2 + git.sigsum.org/sigsum-lib-go v0.0.3 golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 ) diff --git a/go.sum b/go.sum index c098457..d21009f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ git.sigsum.org/sigsum-lib-go v0.0.2 h1:1FwdnraPaasw1D1Lb+flRMJRGLTuZrp17AZ6tx+iT/0= git.sigsum.org/sigsum-lib-go v0.0.2/go.mod h1:DVmlcf0MBHy4IZdnZ5DcbsKkGEd0EkOAoLINhLgcndY= +git.sigsum.org/sigsum-lib-go v0.0.3 h1:VXtUC/LOPVb990P8dFitQkYx8a1M54hKFcsK7MiZ514= +git.sigsum.org/sigsum-lib-go v0.0.3/go.mod h1:DVmlcf0MBHy4IZdnZ5DcbsKkGEd0EkOAoLINhLgcndY= golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= diff --git a/pkg/client/submitter.go b/pkg/client/submitter.go index 21c9258..a1345bc 100644 --- a/pkg/client/submitter.go +++ b/pkg/client/submitter.go @@ -73,7 +73,7 @@ func (sc *SubmitClient) AddLeaves(_ context.Context, leaves []requests.Leaf) ([] bundles = nil for _, leaf := range leaves { l := types.Leaf{ - SignedData: types.SignedData{ + Statement: types.Statement{ ShardHint: leaf.ShardHint, Checksum: *types.HashFn(leaf.Preimage[:]), }, -- cgit v1.2.3