update

pkg/client/client.go

@@ -109,9 +109,9 @@ func (p *sClient) encryptWithParams(
 		cipher.EncryptBytes(joiner.NewBytesJoiner32([][]byte{
 			pkey.GetHasher().ToBytes(),
 			salt,
+			data,
 			hash,
 			p.fPrivKey.GetDSAPrivKey().SignBytes(hash),
-			data,
 		})),
 	).ToBytes(), nil
 }
@@ -141,9 +141,9 @@ func (p *sClient) DecryptMessage(pMapPubKeys asymmetric.IMapPubKeys, pMsg []byte
 	var (
 		pkid = decSlice[0]
 		salt = decSlice[1]
-		hash = decSlice[2]
-		sign = decSlice[3]
-		data = decSlice[4]
+		data = decSlice[2]
+		hash = decSlice[3]
+		sign = decSlice[4]
 	)
 
 	// Get public key from map by pkid (hash)

pkg/client/client_test.go

@@ -169,22 +169,29 @@ func TestDecrypt(t *testing.T) {
 		return
 	}
 
+	mapKeys := asymmetric.NewMapPubKeys(pubKey)
+
+	if _, _, err := client.DecryptMessage(mapKeys, enc); err != nil {
+		t.Error(err)
+		return
+	}
+
 	enc[0] ^= 1
-	if _, _, err := client.DecryptMessage(asymmetric.NewMapPubKeys(), enc); err == nil {
+	if _, _, err := client.DecryptMessage(mapKeys, enc); err == nil {
 		t.Error("success decrypt with invalid ciphertext (2)")
 		return
 	}
 
 	enc[0] ^= 1
 	enc[len(enc)-1] ^= 1
-	if _, _, err := client.DecryptMessage(asymmetric.NewMapPubKeys(), enc); err == nil {
+	if _, _, err := client.DecryptMessage(mapKeys, enc); err == nil {
 		t.Error("success decrypt with invalid ciphertext (3)")
 		return
 	}
 
 	enc[len(enc)-1] ^= 1
-	enc[len(enc)-2000] ^= 1
-	if _, _, err := client.DecryptMessage(asymmetric.NewMapPubKeys(), enc); err == nil {
+	enc[asymmetric.CKEMCiphertextSize+symmetric.CCipherBlockSize+2*encoding.CSizeUint32+hashing.CHasherSize+1] ^= 1
+	if _, _, err := client.DecryptMessage(mapKeys, enc); err == nil {
 		t.Error("success decrypt with invalid ciphertext (4)")
 		return
 	}