update

pkg/client/client.go

@@ -11,6 +11,10 @@ import (
 	"github.com/number571/go-peer/pkg/payload/joiner"
 )
 
+const (
+	cSaltSize = 32 // bytes
+)
+
 var (
 	_ IClient = &sClient{}
 )
@@ -92,9 +96,9 @@ func (p *sClient) encryptWithParams(
 	pPadd uint64,
 ) ([]byte, error) {
 	var (
-		rand    = random.NewCSPRNG()
-		salt    = rand.GetBytes(symmetric.CAESKeySize)
-		session = rand.GetBytes(symmetric.CAESKeySize)
+		rand = random.NewCSPRNG()
+		salt = rand.GetBytes(cSaltSize)
+		skey = rand.GetBytes(symmetric.CAESKeySize)
 	)
 
 	data := joiner.NewBytesJoiner32([][]byte{pMsg, rand.GetBytes(pPadd)})
@@ -107,12 +111,12 @@ func (p *sClient) encryptWithParams(
 		[]byte{},
 	)).ToBytes()
 
-	encKey := pRecv.EncryptBytes(session)
+	encKey := pRecv.EncryptBytes(skey)
 	if encKey == nil {
 		return nil, ErrEncryptSymmetricKey
 	}
 
-	cipher := symmetric.NewAESCipher(session)
+	cipher := symmetric.NewAESCipher(skey)
 	return message.NewMessage(
 		encKey,
 		cipher.EncryptBytes(joiner.NewBytesJoiner32([][]byte{
@@ -134,13 +138,13 @@ func (p *sClient) DecryptMessage(pMsg []byte) (asymmetric.IPubKey, []byte, error
 	}
 
 	// Decrypt session key by private key of receiver.
-	session := p.fPrivKey.DecryptBytes(msg.GetEnck())
-	if session == nil {
+	skey := p.fPrivKey.DecryptBytes(msg.GetEnck())
+	if skey == nil {
 		return nil, nil, ErrDecryptCipherKey
 	}
 
 	// Decrypt data block by decrypted session key. Decode data block.
-	decJoiner := symmetric.NewAESCipher(session).DecryptBytes(msg.GetEncd())
+	decJoiner := symmetric.NewAESCipher(skey).DecryptBytes(msg.GetEncd())
 	decSlice, err := joiner.LoadBytesJoiner32(decJoiner)
 	if err != nil || len(decSlice) != 5 {
 		return nil, nil, ErrDecodeBytesJoiner

pkg/client/client_test.go

@@ -364,7 +364,7 @@ func (p *sClient) tInvalidEncryptPayload1(pRecv asymmetric.IPubKey, pPld payload
 func (p *sClient) tInvalidEncryptWithParams1(pRecv asymmetric.IPubKey, pPld payload.IPayload64, pPadd uint64) message.IMessage {
 	var (
 		rand    = random.NewCSPRNG()
-		salt    = rand.GetBytes(symmetric.CAESKeySize)
+		salt    = rand.GetBytes(cSaltSize)
 		session = rand.GetBytes(symmetric.CAESKeySize)
 	)
 
@@ -433,7 +433,7 @@ func (p *sClient) tInvalidEncryptWithParams2(
 ) (message.IMessage, error) {
 	var (
 		rand    = random.NewCSPRNG()
-		salt    = rand.GetBytes(symmetric.CAESKeySize)
+		salt    = rand.GetBytes(cSaltSize)
 		session = rand.GetBytes(symmetric.CAESKeySize)
 	)
 
@@ -501,7 +501,7 @@ func (p *sClient) tInvalidEncryptWithParams3(
 ) (message.IMessage, error) {
 	var (
 		rand    = random.NewCSPRNG()
-		salt    = rand.GetBytes(symmetric.CAESKeySize)
+		salt    = rand.GetBytes(cSaltSize)
 		session = rand.GetBytes(symmetric.CAESKeySize)
 	)
 
@@ -563,7 +563,7 @@ func (p *sClient) tInvalidEncryptWithParams4(
 ) (message.IMessage, error) {
 	var (
 		rand    = random.NewCSPRNG()
-		salt    = rand.GetBytes(symmetric.CAESKeySize)
+		salt    = rand.GetBytes(cSaltSize)
 		session = rand.GetBytes(symmetric.CAESKeySize)
 	)
 

pkg/crypto/keybuilder/keybuilder_test.go

@@ -4,13 +4,13 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/number571/go-peer/pkg/crypto/symmetric"
 	"github.com/number571/go-peer/pkg/encoding"
 	testutils "github.com/number571/go-peer/test/utils"
 )
 
 const (
-	tcHash = "8d47725f8604cb2e8f1be5e0b49ef143ea62625dd37ea4ce5f24501a32591784"
+	tcKeySize = 32
+	tcHash    = "8d47725f8604cb2e8f1be5e0b49ef143ea62625dd37ea4ce5f24501a32591784"
 )
 
 func TestKeyBuilder(t *testing.T) {
@@ -21,13 +21,13 @@ func TestKeyBuilder(t *testing.T) {
 		salt = []byte("it's a salt!")
 	)
 
-	hash := NewKeyBuilder(1<<testutils.TCWorkSize, salt).Build(pasw, symmetric.CAESKeySize)
+	hash := NewKeyBuilder(1<<testutils.TCWorkSize, salt).Build(pasw, tcKeySize)
 	if encoding.HexEncode(hash) != tcHash {
 		t.Error("hash is correct?")
 		return
 	}
 
-	if !bytes.Equal(hash, NewKeyBuilder(1<<testutils.TCWorkSize, salt).Build(pasw, symmetric.CAESKeySize)) {
+	if !bytes.Equal(hash, NewKeyBuilder(1<<testutils.TCWorkSize, salt).Build(pasw, tcKeySize)) {
 		t.Error("hash is not determined")
 		return
 	}