Merge pull request #17 from everFinance/fix-rsa-threshold

Fix rsa threshold

Author: outprog

go.mod

@@ -5,7 +5,7 @@ go 1.15
 require (
 	github.com/everFinance/gojwk v1.0.0
 	github.com/everFinance/sandy_log v1.0.3
-	github.com/everFinance/ttcrsa v1.1.2
+	github.com/everFinance/ttcrsa v1.1.3
 	github.com/shopspring/decimal v1.2.0
 	github.com/stretchr/testify v1.7.0
 )

go.sum

@@ -4,8 +4,8 @@ github.com/everFinance/gojwk v1.0.0 h1:le/oI2NgXlrqg3MHU6ka+V30EWcD7TD6+Ilh+go79
 github.com/everFinance/gojwk v1.0.0/go.mod h1:icXSXsIdpAczlpAtSljQlmABkMTRZENr73KHmo0GOGc=
 github.com/everFinance/sandy_log v1.0.3 h1:8aZgMOYuerTwTobWvwqi9JgsMvh9uOc5nqymTSLgKFE=
 github.com/everFinance/sandy_log v1.0.3/go.mod h1:Pzm6pXpGKLZxLjmPbQaKYQyD76O5JXaG8oVCiarI/Og=
-github.com/everFinance/ttcrsa v1.1.2 h1:/kBn+gzm0ko/uvgOcwrpI+BvZ+6R36kDgeiTyKZDyGY=
-github.com/everFinance/ttcrsa v1.1.2/go.mod h1:Ws7b/oDbYKaZlvyT17nm+zHmzVhGl51r/yPx/Ib5RQk=
+github.com/everFinance/ttcrsa v1.1.3 h1:RJl9UizbevHZUiWPHVKz1aM6yA8cmkZWaCbOGTD/L0I=
+github.com/everFinance/ttcrsa v1.1.3/go.mod h1:Ws7b/oDbYKaZlvyT17nm+zHmzVhGl51r/yPx/Ib5RQk=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac h1:n1DqxAo4oWPMvH1+v+DLYlMCecgumhhgnxAPdqDIFHI=

threshold.go

@@ -41,10 +41,10 @@ type TcSign struct {
 	pssData  []byte
 }
 
-func NewTcSign(meta *tcrsa.KeyMeta, signData []byte) (*TcSign, error) {
+func NewTcSign(meta *tcrsa.KeyMeta, signData []byte, salt []byte) (*TcSign, error) {
 	signHashed := sha256.Sum256(signData)
 
-	signDataByPss, err := tcrsa.PreparePssDocumentHash(meta.PublicKey.N.BitLen(), crypto.SHA256, signHashed[:], &rsa.PSSOptions{
+	signDataByPss, err := tcrsa.PreparePssDocumentHash(meta.PublicKey.N.BitLen(), signHashed[:], salt, &rsa.PSSOptions{
 		SaltLength: 0,
 		Hash:       crypto.SHA256,
 	})

threshold_test.go

@@ -17,6 +17,7 @@ import (
 func TestCreateTcKeyPair(t *testing.T) {
 	exampleData := []byte("aaabbbcccddd112233")
 	signHashed := sha256.Sum256(exampleData)
+	salt := sha256.Sum256([]byte("everHash salt aaa"))
 
 	/* -------------------------- Key pair that generates RSA threshold signature on the server side ----------------------------*/
 	bitSize := 1024 // If the values are 2048 and 4096, then the generation functions below will perform minute-level times, and we need 4096 bits as the maximum safety level for production environments.
@@ -28,7 +29,7 @@ func TestCreateTcKeyPair(t *testing.T) {
 		panic(err)
 	}
 
-	ts, err := NewTcSign(keyMeta, exampleData)
+	ts, err := NewTcSign(keyMeta, exampleData, salt[:])
 	if err != nil {
 		panic(err)
 	}
@@ -77,6 +78,8 @@ func TestCreateTcKeyPair(t *testing.T) {
 		signedData05,
 	}
 
+	ts, err = NewTcSign(keyMeta, exampleData, salt[:])
+	assert.NoError(t, err)
 	signature, err := ts.AssembleSigShares(signedShares)
 	if err != nil {
 		panic(err)

wallet_test.go

@@ -83,18 +83,15 @@ func TestWallet_SendDataSpeedUp02(t *testing.T) {
 	// w, err := NewWalletFromPath("./wallet/account1.json", arNode, proxyUrl) // your wallet private key
 	// assert.NoError(t, err)
 	//
-	// data, err := ioutil.ReadFile("/Users/sandyzhou/Downloads/650.zip")
+	// data, err := ioutil.ReadFile("/Users/sandyzhou/Downloads/abc.jpeg")
 	// if err != nil {
 	// 	panic(err)
 	// }
 	// tags := []types.Tag{
-	// 	{Name: "Content-Type", Value: "zip"},
-	// 	{Name: "Sender", Value: "Sandy"},
-	// 	{Name: "Receiver", Value: "pangpang"},
-	// 	{Name: "Date-Size", Value: "16.6MB"},
-	// 	{Name: "Data-Introduce", Value: "College 650 dormitory photos from 2014 to 2018"},
+	// 	{Name: "Sender", Value: "Jie"},
+	// 	{Name: "Data-Introduce", Value: "Happy anniversary, my google and dearest! I‘m so grateful to have you in my life. I love you to infinity and beyond! (⁎⁍̴̛ᴗ⁍̴̛⁎)"},
 	// }
 	// id, err := w.SendDataSpeedUp(data, tags, 10)
 	// assert.NoError(t, err)
-	// t.Logf("tx hash: %s;", id)
+	// t.Logf("tx hash: %s", id)
 }