diff options
| -rw-r--r-- | cmd/tmp/cosign/main.go | 2 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rwxr-xr-x | integration/test.sh | 4 | ||||
| -rw-r--r-- | pkg/instance/handler.go | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/cmd/tmp/cosign/main.go b/cmd/tmp/cosign/main.go index 419ef59..5d07368 100644 --- a/cmd/tmp/cosign/main.go +++ b/cmd/tmp/cosign/main.go @@ -35,7 +35,7 @@ func main() { vk := sk.Public().(ed25519.PublicKey) fmt.Printf("sk: %x\nvk: %x\n", sk, vk) - rsp, err := http.Get(*url + "/get-tree-head-to-sign") + rsp, err := http.Get(*url + "/get-tree-head-to-cosign") if err != nil { log.Fatal(err) } @@ -3,7 +3,7 @@ module git.sigsum.org/log-go go 1.15 require ( - git.sigsum.org/sigsum-go v0.0.5 + git.sigsum.org/sigsum-go v0.0.6 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/mock v1.4.4 github.com/google/certificate-transparency-go v1.1.1 // indirect @@ -33,8 +33,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.sigsum.org/sigsum-go v0.0.5 h1:WjpMC4vhxbHuA6+xTDRN2EHWoE/y6IUvhOk/a7M9vBI= -git.sigsum.org/sigsum-go v0.0.5/go.mod h1:atThndG2UQarpAMDfAWmgm9YYIvuYwbeTDx12kztD0w= +git.sigsum.org/sigsum-go v0.0.6 h1:Ck6Ch0rGoAde29Z4zScNmwfbl8dJMNBNxQykYpJEojM= +git.sigsum.org/sigsum-go v0.0.6/go.mod h1:atThndG2UQarpAMDfAWmgm9YYIvuYwbeTDx12kztD0w= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= diff --git a/integration/test.sh b/integration/test.sh index f18fa77..2ba101b 100755 --- a/integration/test.sh +++ b/integration/test.sh @@ -201,7 +201,7 @@ function run_tests() { function test_signed_tree_head() { desc="GET tree-head-to-sign (tree size $1)" - curl -s -w "%{http_code}" $log_url/get-tree-head-to-sign \ + curl -s -w "%{http_code}" $log_url/get-tree-head-to-cosign \ >$log_dir/rsp if [[ $(status_code) != 200 ]]; then @@ -387,7 +387,7 @@ function test_add_leaf() { function test_cosignature() { desc="POST add-cosignature (witness $1)" echo "key_hash=$1" > $log_dir/req - echo "cosignature=$(curl -s $log_url/get-tree-head-to-sign | + echo "cosignature=$(curl -s $log_url/get-tree-head-to-cosign | sigsum-debug head sign -k $2 -h $ssrv_key_hash)" >> $log_dir/req cat $log_dir/req | curl -s -w "%{http_code}" --data-binary @- $log_url/add-cosignature \ diff --git a/pkg/instance/handler.go b/pkg/instance/handler.go index 24fa575..ecc22e2 100644 --- a/pkg/instance/handler.go +++ b/pkg/instance/handler.go @@ -104,7 +104,7 @@ func addCosignature(ctx context.Context, i *Instance, w http.ResponseWriter, r * } func getTreeHeadToCosign(ctx context.Context, i *Instance, w http.ResponseWriter, _ *http.Request) (int, error) { - glog.V(3).Info("handling get-tree-head-to-sign request") + glog.V(3).Info("handling get-tree-head-to-cosign request") sth, err := i.Stateman.ToCosignTreeHead(ctx) if err != nil { return http.StatusInternalServerError, err |