Fix change password (#1490)

Qiao-Jin · web-flow · commit 6eba2ee12d12 · 2020-03-23T14:39:48.000+08:00
diff --git a/src/neo/Wallets/SQLite/UserWallet.cs b/src/neo/Wallets/SQLite/UserWallet.cs
@@ -174,7 +174,7 @@ public bool ChangePassword(string password_old, string password_new)
             byte[] passwordKey = password_new.ToAesKey();
             try
             {
-                SaveStoredData("PasswordHash", passwordKey.Sha256());
+                SaveStoredData("PasswordHash", passwordKey.Concat(salt).ToArray().Sha256());
                 SaveStoredData("MasterKey", masterKey.AesEncrypt(passwordKey, iv));
                 return true;
             }
diff --git a/tests/neo.UnitTests/Wallets/SQLite/UT_UserWallet.cs b/tests/neo.UnitTests/Wallets/SQLite/UT_UserWallet.cs
@@ -167,6 +167,7 @@ public void TestChangePassword()
         {
             wallet.ChangePassword("123455", "654321").Should().BeFalse();
             wallet.ChangePassword("123456", "654321").Should().BeTrue();
+            wallet.ChangePassword("654321", "123456").Should().BeTrue();
         }
 
         [TestMethod]

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public bool ChangePassword(string password_old, string password_new)`
`174`	`174`	`byte[] passwordKey = password_new.ToAesKey();`
`175`	`175`	`try`
`176`	`176`	`{`
`177`		`- SaveStoredData("PasswordHash", passwordKey.Sha256());`
	`177`	`+ SaveStoredData("PasswordHash", passwordKey.Concat(salt).ToArray().Sha256());`
`178`	`178`	`SaveStoredData("MasterKey", masterKey.AesEncrypt(passwordKey, iv));`
`179`	`179`	`return true;`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ public void TestChangePassword()`
`167`	`167`	`{`
`168`	`168`	`wallet.ChangePassword("123455", "654321").Should().BeFalse();`
`169`	`169`	`wallet.ChangePassword("123456", "654321").Should().BeTrue();`
	`170`	`+ wallet.ChangePassword("654321", "123456").Should().BeTrue();`
`170`	`171`	`}`
`171`	`172`
`172`	`173`	`[TestMethod]`