Merge branch 'master' into steb/optimize-aggregation

group/p256/group_test.go

@@ -1,8 +1,12 @@
 package p256
 
 import (
+	"encoding/hex"
+	"math/big"
+	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"go.dedis.ch/kyber/v4/util/test"
 )
 
@@ -24,6 +28,26 @@ func TestSetBytesBE(t *testing.T) {
 	}
 }
 
+func TestVectors(t *testing.T) {
+	k := big.NewInt(0)
+	s := testP256.Scalar()
+
+	BasePoint := testP256.Point().Base().(*curvePoint)
+	BasePoint.x.SetString(basePointScalarMult[0].X, 16)
+	BasePoint.y.SetString(basePointScalarMult[0].Y, 16)
+
+	for _, vec := range basePointScalarMult {
+		// Read from strings
+		k, ok := k.SetString(vec.K, 10)
+		require.Equal(t, true, ok)
+		s.SetBytes(k.Bytes())
+
+		Q := testP256.Point().Mul(s, BasePoint).(*curvePoint)
+		require.Equal(t, strings.ToLower(vec.X), hex.EncodeToString(Q.x.Bytes()))
+		require.Equal(t, strings.ToLower(vec.Y), hex.EncodeToString(Q.y.Bytes()))
+	}
+}
+
 var benchP256 = test.NewGroupBench(testP256)
 
 func BenchmarkScalarAdd(b *testing.B)    { benchP256.ScalarAdd(b.N) }

group/p256/test_vectors_test.go

@@ -0,0 +1,220 @@
+package p256
+
+// Data from: http://point-at-infinity.org/ecc/nisttv
+var basePointScalarMult = []struct {
+	K string
+	X string
+	Y string
+}{
+	{
+		"1",
+		"6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296",
+		"4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5",
+	},
+	{
+		"2",
+		"7CF27B188D034F7E8A52380304B51AC3C08969E277F21B35A60B48FC47669978",
+		"07775510DB8ED040293D9AC69F7430DBBA7DADE63CE982299E04B79D227873D1",
+	},
+	{
+		"3",
+		"5ECBE4D1A6330A44C8F7EF951D4BF165E6C6B721EFADA985FB41661BC6E7FD6C",
+		"8734640C4998FF7E374B06CE1A64A2ECD82AB036384FB83D9A79B127A27D5032",
+	}, {
+		"4",
+		"E2534A3532D08FBBA02DDE659EE62BD0031FE2DB785596EF509302446B030852",
+		"E0F1575A4C633CC719DFEE5FDA862D764EFC96C3F30EE0055C42C23F184ED8C6",
+	}, {
+		"5",
+		"51590B7A515140D2D784C85608668FDFEF8C82FD1F5BE52421554A0DC3D033ED",
+		"E0C17DA8904A727D8AE1BF36BF8A79260D012F00D4D80888D1D0BB44FDA16DA4",
+	}, {
+		"6",
+		"B01A172A76A4602C92D3242CB897DDE3024C740DEBB215B4C6B0AAE93C2291A9",
+		"E85C10743237DAD56FEC0E2DFBA703791C00F7701C7E16BDFD7C48538FC77FE2",
+	}, {
+		"7",
+		"8E533B6FA0BF7B4625BB30667C01FB607EF9F8B8A80FEF5B300628703187B2A3",
+		"73EB1DBDE03318366D069F83A6F5900053C73633CB041B21C55E1A86C1F400B4",
+	}, {
+		"8",
+		"62D9779DBEE9B0534042742D3AB54CADC1D238980FCE97DBB4DD9DC1DB6FB393",
+		"AD5ACCBD91E9D8244FF15D771167CEE0A2ED51F6BBE76A78DA540A6A0F09957E",
+	}, {
+		"9",
+		"EA68D7B6FEDF0B71878938D51D71F8729E0ACB8C2C6DF8B3D79E8A4B90949EE0",
+		"2A2744C972C9FCE787014A964A8EA0C84D714FEAA4DE823FE85A224A4DD048FA",
+	}, {
+		"10",
+		"CEF66D6B2A3A993E591214D1EA223FB545CA6C471C48306E4C36069404C5723F",
+		"878662A229AAAE906E123CDD9D3B4C10590DED29FE751EEECA34BBAA44AF0773",
+	}, {
+		"11",
+		"3ED113B7883B4C590638379DB0C21CDA16742ED0255048BF433391D374BC21D1",
+		"9099209ACCC4C8A224C843AFA4F4C68A090D04DA5E9889DAE2F8EEFCE82A3740",
+	}, {
+		"12",
+		"741DD5BDA817D95E4626537320E5D55179983028B2F82C99D500C5EE8624E3C4",
+		"0770B46A9C385FDC567383554887B1548EEB912C35BA5CA71995FF22CD4481D3",
+	}, {
+		"13",
+		"177C837AE0AC495A61805DF2D85EE2FC792E284B65EAD58A98E15D9D46072C01",
+		"63BB58CD4EBEA558A24091ADB40F4E7226EE14C3A1FB4DF39C43BBE2EFC7BFD8",
+	}, {
+		"14",
+		"54E77A001C3862B97A76647F4336DF3CF126ACBE7A069C5E5709277324D2920B",
+		"F599F1BB29F4317542121F8C05A2E7C37171EA77735090081BA7C82F60D0B375",
+	}, {
+		"15",
+		"F0454DC6971ABAE7ADFB378999888265AE03AF92DE3A0EF163668C63E59B9D5F",
+		"B5B93EE3592E2D1F4E6594E51F9643E62A3B21CE75B5FA3F47E59CDE0D034F36",
+	}, {
+		"16",
+		"76A94D138A6B41858B821C629836315FCD28392EFF6CA038A5EB4787E1277C6E",
+		"A985FE61341F260E6CB0A1B5E11E87208599A0040FC78BAA0E9DDD724B8C5110",
+	}, {
+		"17",
+		"47776904C0F1CC3A9C0984B66F75301A5FA68678F0D64AF8BA1ABCE34738A73E",
+		"AA005EE6B5B957286231856577648E8381B2804428D5733F32F787FF71F1FCDC",
+	}, {
+		"18",
+		"1057E0AB5780F470DEFC9378D1C7C87437BB4C6F9EA55C63D936266DBD781FDA",
+		"F6F1645A15CBE5DC9FA9B7DFD96EE5A7DCC11B5C5EF4F1F78D83B3393C6A45A2",
+	}, {
+		"19",
+		"CB6D2861102C0C25CE39B7C17108C507782C452257884895C1FC7B74AB03ED83",
+		"58D7614B24D9EF515C35E7100D6D6CE4A496716E30FA3E03E39150752BCECDAA",
+	}, {
+		"20",
+		"83A01A9378395BAB9BCD6A0AD03CC56D56E6B19250465A94A234DC4C6B28DA9A",
+		"76E49B6DE2F73234AE6A5EB9D612B75C9F2202BB6923F54FF8240AAA86F640B8",
+	}, {
+		"112233445566778899",
+		"339150844EC15234807FE862A86BE77977DBFB3AE3D96F4C22795513AEAAB82F",
+		"B1C14DDFDC8EC1B2583F51E85A5EB3A155840F2034730E9B5ADA38B674336A21",
+	}, {
+		"112233445566778899112233445566778899",
+		"1B7E046A076CC25E6D7FA5003F6729F665CC3241B5ADAB12B498CD32F2803264",
+		"BFEA79BE2B666B073DB69A2A241ADAB0738FE9D2DD28B5604EB8C8CF097C457B",
+	}, {
+		"29852220098221261079183923314599206100666902414330245206392788703677545185283",
+		"9EACE8F4B071E677C5350B02F2BB2B384AAE89D58AA72CA97A170572E0FB222F",
+		"1BBDAEC2430B09B93F7CB08678636CE12EAAFD58390699B5FD2F6E1188FC2A78",
+	}, {
+		"57896042899961394862005778464643882389978449576758748073725983489954366354431",
+		"878F22CC6DB6048D2B767268F22FFAD8E56AB8E2DC615F7BD89F1E350500DD8D",
+		"714A5D7BB901C9C5853400D12341A892EF45D87FC553786756C4F0C9391D763E",
+	}, {
+		"1766845392945710151501889105729049882997660004824848915955419660366636031",
+		"659A379625AB122F2512B8DADA02C6348D53B54452DFF67AC7ACE4E8856295CA",
+		"49D81AB97B648464D0B4A288BD7818FAB41A16426E943527C4FED8736C53D0F6",
+	}, {
+		"28948025760307534517734791687894775804466072615242963443097661355606862201087",
+		"CBCEAAA8A4DD44BBCE58E8DB7740A5510EC2CB7EA8DA8D8F036B3FB04CDA4DE4",
+		"4BD7AA301A80D7F59FD983FEDBE59BB7B2863FE46494935E3745B360E32332FA",
+	}, {
+		"113078210460870548944811695960290644973229224625838436424477095834645696384",
+		"F0C4A0576154FF3A33A3460D42EAED806E854DFA37125221D37935124BA462A4",
+		"5B392FA964434D29EEC6C9DBC261CF116796864AA2FAADB984A2DF38D1AEF7A3",
+	}, {
+		"12078056106883488161242983286051341125085761470677906721917479268909056",
+		"5E6C8524B6369530B12C62D31EC53E0288173BD662BDF680B53A41ECBCAD00CC",
+		"447FE742C2BFEF4D0DB14B5B83A2682309B5618E0064A94804E9282179FE089F",
+	}, {
+		"57782969857385448082319957860328652998540760998293976083718804450708503920639",
+		"03792E541BC209076A3D7920A915021ECD396A6EB5C3960024BE5575F3223484",
+		"FC774AE092403101563B712F68170312304F20C80B40C06282063DB25F268DE4",
+	}, {
+		"57896017119460046759583662757090100341435943767777707906455551163257755533312",
+		"2379FF85AB693CDF901D6CE6F2473F39C04A2FE3DCD842CE7AAB0E002095BCF8",
+		"F8B476530A634589D5129E46F322B02FBC610A703D80875EE70D7CE1877436A1",
+	}, {
+		"452312848374287284681282171017647412726433684238464212999305864837160993279",
+		"C1E4072C529BF2F44DA769EFC934472848003B3AF2C0F5AA8F8DDBD53E12ED7C",
+		"39A6EE77812BB37E8079CD01ED649D3830FCA46F718C1D3993E4A591824ABCDB",
+	}, {
+		"904571339174065134293634407946054000774746055866917729876676367558469746684",
+		"34DFBC09404C21E250A9B40FA8772897AC63A094877DB65862B61BD1507B34F3",
+		"CF6F8A876C6F99CEAEC87148F18C7E1E0DA6E165FFC8ED82ABB65955215F77D3",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044349",
+		"83A01A9378395BAB9BCD6A0AD03CC56D56E6B19250465A94A234DC4C6B28DA9A",
+		"891B64911D08CDCC5195A14629ED48A360DDFD4596DC0AB007DBF5557909BF47",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044350",
+		"CB6D2861102C0C25CE39B7C17108C507782C452257884895C1FC7B74AB03ED83",
+		"A7289EB3DB2610AFA3CA18EFF292931B5B698E92CF05C1FC1C6EAF8AD4313255",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044351",
+		"1057E0AB5780F470DEFC9378D1C7C87437BB4C6F9EA55C63D936266DBD781FDA",
+		"090E9BA4EA341A246056482026911A58233EE4A4A10B0E08727C4CC6C395BA5D",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044352",
+		"47776904C0F1CC3A9C0984B66F75301A5FA68678F0D64AF8BA1ABCE34738A73E",
+		"55FFA1184A46A8D89DCE7A9A889B717C7E4D7FBCD72A8CC0CD0878008E0E0323",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044353",
+		"76A94D138A6B41858B821C629836315FCD28392EFF6CA038A5EB4787E1277C6E",
+		"567A019DCBE0D9F2934F5E4A1EE178DF7A665FFCF0387455F162228DB473AEEF",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044354",
+		"F0454DC6971ABAE7ADFB378999888265AE03AF92DE3A0EF163668C63E59B9D5F",
+		"4A46C11BA6D1D2E1B19A6B1AE069BC19D5C4DE328A4A05C0B81A6321F2FCB0C9",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044355",
+		"54E77A001C3862B97A76647F4336DF3CF126ACBE7A069C5E5709277324D2920B",
+		"0A660E43D60BCE8BBDEDE073FA5D183C8E8E15898CAF6FF7E45837D09F2F4C8A",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044356",
+		"177C837AE0AC495A61805DF2D85EE2FC792E284B65EAD58A98E15D9D46072C01",
+		"9C44A731B1415AA85DBF6E524BF0B18DD911EB3D5E04B20C63BC441D10384027",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044357",
+		"741DD5BDA817D95E4626537320E5D55179983028B2F82C99D500C5EE8624E3C4",
+		"F88F4B9463C7A024A98C7CAAB7784EAB71146ED4CA45A358E66A00DD32BB7E2C",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044358",
+		"3ED113B7883B4C590638379DB0C21CDA16742ED0255048BF433391D374BC21D1",
+		"6F66DF64333B375EDB37BC505B0B3975F6F2FB26A16776251D07110317D5C8BF",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044359",
+		"CEF66D6B2A3A993E591214D1EA223FB545CA6C471C48306E4C36069404C5723F",
+		"78799D5CD655517091EDC32262C4B3EFA6F212D7018AE11135CB4455BB50F88C",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044360",
+		"EA68D7B6FEDF0B71878938D51D71F8729E0ACB8C2C6DF8B3D79E8A4B90949EE0",
+		"D5D8BB358D36031978FEB569B5715F37B28EB0165B217DC017A5DDB5B22FB705",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044361",
+		"62D9779DBEE9B0534042742D3AB54CADC1D238980FCE97DBB4DD9DC1DB6FB393",
+		"52A533416E1627DCB00EA288EE98311F5D12AE0A4418958725ABF595F0F66A81",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044362",
+		"8E533B6FA0BF7B4625BB30667C01FB607EF9F8B8A80FEF5B300628703187B2A3",
+		"8C14E2411FCCE7CA92F9607C590A6FFFAC38C9CD34FBE4DE3AA1E5793E0BFF4B",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044363",
+		"B01A172A76A4602C92D3242CB897DDE3024C740DEBB215B4C6B0AAE93C2291A9",
+		"17A3EF8ACDC8252B9013F1D20458FC86E3FF0890E381E9420283B7AC7038801D",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044364",
+		"51590B7A515140D2D784C85608668FDFEF8C82FD1F5BE52421554A0DC3D033ED",
+		"1F3E82566FB58D83751E40C9407586D9F2FED1002B27F7772E2F44BB025E925B",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044365",
+		"E2534A3532D08FBBA02DDE659EE62BD0031FE2DB785596EF509302446B030852",
+		"1F0EA8A4B39CC339E62011A02579D289B103693D0CF11FFAA3BD3DC0E7B12739",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044366",
+		"5ECBE4D1A6330A44C8F7EF951D4BF165E6C6B721EFADA985FB41661BC6E7FD6C",
+		"78CB9BF2B6670082C8B4F931E59B5D1327D54FCAC7B047C265864ED85D82AFCD",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044367",
+		"7CF27B188D034F7E8A52380304B51AC3C08969E277F21B35A60B48FC47669978",
+		"F888AAEE24712FC0D6C26539608BCF244582521AC3167DD661FB4862DD878C2E",
+	}, {
+		"115792089210356248762697446949407573529996955224135760342422259061068512044368",
+		"6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296",
+		"B01CBD1C01E58065711814B583F061E9D431CCA994CEA1313449BF97C840AE0A",
+	},
+}

pairing/bls12381/bls12381_test.go

@@ -810,3 +810,33 @@ func BLSBenchmark(b *testing.B, curveOption string) {
 		}
 	})
 }
+
+// This signature fails to validate when using kilic@7536ae1cb938a818cffabc34c4f9a7335b1c7f9a or latter
+func TestSignatureEdgeCase(t *testing.T) {
+	// G2 pubkey
+	publicBytes := []byte{0x83, 0xcf, 0xf, 0x28, 0x96, 0xad, 0xee, 0x7e, 0xb8, 0xb5, 0xf0, 0x1f, 0xca, 0xd3, 0x91, 0x22, 0x12, 0xc4, 0x37, 0xe0, 0x7, 0x3e, 0x91, 0x1f, 0xb9, 0x0, 0x22, 0xd3, 0xe7, 0x60, 0x18, 0x3c, 0x8c, 0x4b, 0x45, 0xb, 0x6a, 0xa, 0x6c, 0x3a, 0xc6, 0xa5, 0x77, 0x6a, 0x2d, 0x10, 0x64, 0x51, 0xd, 0x1f, 0xec, 0x75, 0x8c, 0x92, 0x1c, 0xc2, 0x2b, 0xe, 0x17, 0xe6, 0x3a, 0xaf, 0x4b, 0xcb, 0x5e, 0xd6, 0x63, 0x4, 0xde, 0x9c, 0xf8, 0x9, 0xbd, 0x27, 0x4c, 0xa7, 0x3b, 0xab, 0x4a, 0xf5, 0xa6, 0xe9, 0xc7, 0x6a, 0x4b, 0xc0, 0x9e, 0x76, 0xea, 0xe8, 0x99, 0x1e, 0xf5, 0xec, 0xe4, 0x5a}
+	message := []byte{0xa1, 0xc6, 0xbe, 0xc3, 0xb9, 0xa6, 0xf0, 0x98, 0x9d, 0x4d, 0x80, 0x2d, 0xbf, 0xe2, 0xb9, 0xb, 0x49, 0x5f, 0xa1, 0x74, 0x2b, 0x58, 0x99, 0x63, 0x45, 0x1e, 0xeb, 0xa9, 0xb1, 0x87, 0xb8, 0x15}
+	// G1 signature
+	sig := []byte{0x95, 0x89, 0x0, 0x9b, 0x47, 0xbf, 0xd9, 0xe3, 0x65, 0x10, 0x6b, 0x11, 0xa3, 0x42, 0xfe, 0x50, 0x75, 0xeb, 0x44, 0x5, 0xb0, 0x2b, 0x80, 0xe8, 0x93, 0x42, 0x69, 0x86, 0xcf, 0xb6, 0x0, 0x77, 0x99, 0x8e, 0x3b, 0x47, 0x99, 0x68, 0x86, 0xe0, 0x35, 0xca, 0x1c, 0xde, 0x5f, 0xd9, 0x62, 0x89}
+
+	var suites = []struct {
+		name  string
+		suite pairing.Suite
+	}{
+		{"kilic", kilic.NewBLS12381Suite()},
+		{"circl", circl.NewSuiteBLS12381()},
+	}
+	for _, s := range suites {
+		suite := s.suite
+		t.Run(s.name, func(t *testing.T) {
+			schemeOnG1 := bls.NewSchemeOnG1(suite)
+			pubkey := suite.G2().Point()
+			err := pubkey.UnmarshalBinary(publicBytes)
+			require.NoError(t, err)
+
+			err = schemeOnG1.Verify(pubkey, message, sig)
+			require.NoError(t, err)
+		})
+
+	}
+}

pairing/bls12381/circl/g1.go

@@ -97,5 +97,7 @@ func (p *G1Elt) Mul(s kyber.Scalar, q kyber.Point) kyber.Point {
 
 func (p *G1Elt) IsInCorrectGroup() bool { return p.inner.IsOnG1() }
 
-func (p *G1Elt) Hash(msg []byte) kyber.Point       { p.inner.Hash(msg, nil); return p }
+var domainG1 = []byte("BLS_SIG_BLS12381G1_XMD:SHA-256_SSWU_RO_NUL_")
+
+func (p *G1Elt) Hash(msg []byte) kyber.Point       { p.inner.Hash(msg, domainG1); return p }
 func (p *G1Elt) Hash2(msg, dst []byte) kyber.Point { p.inner.Hash(msg, dst); return p }

pairing/bls12381/circl/g2.go

@@ -97,5 +97,7 @@ func (p *G2Elt) Mul(s kyber.Scalar, q kyber.Point) kyber.Point {
 
 func (p *G2Elt) IsInCorrectGroup() bool { return p.inner.IsOnG2() }
 
-func (p *G2Elt) Hash(msg []byte) kyber.Point       { p.inner.Hash(msg, nil); return p }
+var domainG2 = []byte("BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_NUL_")
+
+func (p *G2Elt) Hash(msg []byte) kyber.Point       { p.inner.Hash(msg, domainG2); return p }
 func (p *G2Elt) Hash2(msg, dst []byte) kyber.Point { p.inner.Hash(msg, dst); return p }

pairing/bn254/point.go

@@ -235,31 +235,31 @@ func mapToPoint(domain []byte, u *gfP) kyber.Point {
 	tv1 := &gfP{}
 	tv1.Set(u)
 	gfpMul(tv1, tv1, tv1)
-	gfpMul(tv1, tv1, c1)
+	gfpMul(tv1, tv1, c1) // tv1 = u^2 * g(Z)
 	tv2 := &gfP{}
-	gfpAdd(tv2, newGFp(1), tv1)
+	gfpAdd(tv2, newGFp(1), tv1) // tv2 = 1 + tv1
 	negTv1 := &gfP{}
 	gfpNeg(negTv1, tv1)
-	gfpAdd(tv1, newGFp(1), negTv1)
+	gfpAdd(tv1, newGFp(1), negTv1) // tv1 = 1 - tv1
 	tv3 := &gfP{}
 	gfpMul(tv3, tv1, tv2)
-	tv3.Invert(tv3)
+	tv3.Invert(tv3) // tv3 = inv0(tv1 * tv2)
 	tv5 := &gfP{}
 	gfpMul(tv5, u, tv1)
 	gfpMul(tv5, tv5, tv3)
-	gfpMul(tv5, tv5, c3)
+	gfpMul(tv5, tv5, c3) // tv5 = u * tv1 * tv3 * tv4
 	x1 := &gfP{}
-	gfpSub(x1, c2, tv5)
+	gfpSub(x1, c2, tv5) // x1 = -Z / 2 - tv5
 	x2 := &gfP{}
-	gfpAdd(x2, c2, tv5)
+	gfpAdd(x2, c2, tv5) // x2 = -Z / 2 + tv5
 	tv7 := &gfP{}
-	gfpMul(tv7, tv2, tv2)
+	gfpMul(tv7, tv2, tv2) // tv7 = tv2^2
 	tv8 := &gfP{}
-	gfpMul(tv8, tv7, tv3)
+	gfpMul(tv8, tv7, tv3) // tv8 = tv2^2 * tv3
 	x3 := &gfP{}
-	gfpMul(x3, tv8, tv8)
-	gfpMul(x3, c4, x3)
-	gfpAdd(x3, newGFp(1), x3)
+	gfpMul(x3, tv8, tv8)      // x3 = tv8^2
+	gfpMul(x3, c4, x3)        // x3 = c4 * x3
+	gfpAdd(x3, newGFp(1), x3) // x3 = 1 + x3
 
 	var x *gfP
 	y := &gfP{}

pairing/bn254/suite.go

@@ -38,11 +38,11 @@ type Suite struct {
 }
 
 func newDefaultDomainG1() []byte {
-	return []byte("BN254G1_XMD:KECCAK-256_SSWU_RO_")
+	return []byte("BN254G1_XMD:KECCAK-256_SVDW_RO_")
 }
 
 func newDefaultDomainG2() []byte {
-	return []byte("BN254G2_XMD:KECCAK-256_SSWU_RO_")
+	return []byte("BN254G2_XMD:KECCAK-256_SVDW_RO_")
 }
 
 // NewSuite generates and returns a new BN254 pairing suite.

sign/bls/bls.go

@@ -87,7 +87,7 @@ func (s *scheme) Verify(X kyber.Point, msg, sig []byte) error {
 	HM := hashable.Hash(msg)
 	sigPoint := s.sigGroup.Point()
 	if err := sigPoint.UnmarshalBinary(sig); err != nil {
-		return err
+		return fmt.Errorf("bls: unmarshalling signature point: %w", err)
 	}
 	if !s.pairing(X, HM, sigPoint) {
 		return errors.New("bls: invalid signature")