Merge pull request algorand#4071 from Algo-devops-service/relstable3.7.0

compactcert/structs.go

@@ -25,7 +25,7 @@ import (
 
 // Params defines common parameters for the verifier and builder.
 type Params struct {
-	Msg          crypto.Hashable // Message to be cerified
+	Msg          crypto.Hashable // Message to be certified
 	ProvenWeight uint64          // Weight threshold proven by the certificate
 	SigRound     basics.Round    // The round for which the ephemeral key is committed to
 	SecKQ        uint64          // Security parameter (k+q) from analysis document

hashes.go

@@ -17,6 +17,7 @@
 package crypto
 
 import (
+	"crypto/sha256"
 	"crypto/sha512"
 	"errors"
 	"fmt"
@@ -41,7 +42,7 @@ func (h HashType) Validate() error {
 const (
 	Sha512_256 HashType = iota
 	Sumhash
-
+	Sha256
 	MaxHashType
 )
 
@@ -53,6 +54,7 @@ const MaxHashDigestSize = SumhashDigestSize
 const (
 	Sha512_256Size    = sha512.Size256
 	SumhashDigestSize = sumhash.Sumhash512DigestSize
+	Sha256Size        = sha256.Size
 )
 
 // HashFactory is responsible for generating new hashes accordingly to the type it stores.
@@ -71,6 +73,8 @@ func (h HashType) String() string {
 		return "sha512_256"
 	case Sumhash:
 		return "sumhash"
+	case Sha256:
+		return "sha256"
 	default:
 		return ""
 	}
@@ -83,6 +87,8 @@ func UnmarshalHashType(s string) (HashType, error) {
 		return Sha512_256, nil
 	case "sumhash":
 		return Sumhash, nil
+	case "sha256":
+		return Sha256, nil
 	default:
 		return 0, fmt.Errorf("HashType not supported: %s", s)
 	}
@@ -96,6 +102,8 @@ func (z HashFactory) NewHash() hash.Hash {
 		return sha512.New512_256()
 	case Sumhash:
 		return sumhash.New512(nil)
+	case Sha256:
+		return sha256.New()
 	// This shouldn't be reached, when creating a new hash, one would know the type of hash they wanted,
 	// in addition to that, unmarshalling of the hashFactory verifies the HashType of the factory.
 	default:

hashes_test.go

@@ -37,6 +37,9 @@ func TestHashFactoryCreatingNewHashes(t *testing.T) {
 	a.NotNil(h)
 	a.Equal(SumhashDigestSize, h.Size())
 
+	h = HashFactory{HashType: Sha256}.NewHash()
+	a.NotNil(h)
+	a.Equal(Sha256Size, h.Size())
 }
 
 func TestHashSum(t *testing.T) {

secp256k1/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // This file is part of a workaround for `go mod vendor` which won't vendor

secp256k1/libsecp256k1/contrib/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/libsecp256k1/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/libsecp256k1/include/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/libsecp256k1/src/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/libsecp256k1/src/modules/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/libsecp256k1/src/modules/ecdh/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/libsecp256k1/src/modules/recovery/dummy.go

@@ -1,3 +1,4 @@
+//go:build dummy
 // +build dummy
 
 // Package c contains only a C file.

secp256k1/panic_cb.go

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build !gofuzz
-// +build cgo
+//go:build !gofuzz && cgo
+// +build !gofuzz,cgo
 
 package secp256k1
 

secp256k1/scalar_mult_cgo.go

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build !gofuzz
-// +build cgo
+//go:build !gofuzz && cgo
+// +build !gofuzz,cgo
 
 package secp256k1
 

secp256k1/scalar_mult_nocgo.go

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
+//go:build gofuzz || !cgo
 // +build gofuzz !cgo
 
 package secp256k1

secp256k1/secp256.go

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be found in
 // the LICENSE file.
 
-// +build !gofuzz
-// +build cgo
+//go:build !gofuzz && cgo
+// +build !gofuzz,cgo
 
 // Package secp256k1 wraps the bitcoin secp256k1 C library.
 package secp256k1