Merge branch 'master' into incentive_for_voter

neo-project · Oct 28, 2020 · 15792c2 · 15792c2
2 parents 5173eeb + 7d3a4a2
commit 15792c2
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 351 deletions.
diff --git a/src/neo/Cryptography/SCrypt.cs b/src/neo/Cryptography/SCrypt.cs
diff --git a/src/neo/Wallets/KeyPair.cs b/src/neo/Wallets/KeyPair.cs
@@ -1,5 +1,6 @@
 using Neo.Cryptography;
 using Neo.SmartContract;
+using Org.BouncyCastle.Crypto.Generators;
 using System;
 using System.Text;
 using static Neo.Wallets.Helper;
@@ -56,7 +57,7 @@ public string Export(string passphrase, int N = 16384, int r = 8, int p = 8)
             UInt160 script_hash = Contract.CreateSignatureRedeemScript(PublicKey).ToScriptHash();
             string address = script_hash.ToAddress();
             byte[] addresshash = Encoding.ASCII.GetBytes(address).Sha256().Sha256()[..4];
-            byte[] derivedkey = SCrypt.DeriveKey(Encoding.UTF8.GetBytes(passphrase), addresshash, N, r, p, 64);
+            byte[] derivedkey = SCrypt.Generate(Encoding.UTF8.GetBytes(passphrase), addresshash, N, r, p, 64);
             byte[] derivedhalf1 = derivedkey[..32];
             byte[] derivedhalf2 = derivedkey[32..];
             byte[] encryptedkey = XOR(PrivateKey, derivedhalf1).AES256Encrypt(derivedhalf2);

diff --git a/src/neo/Wallets/Wallet.cs b/src/neo/Wallets/Wallet.cs
@@ -7,6 +7,7 @@
 using Neo.SmartContract.Manifest;
 using Neo.SmartContract.Native;
 using Neo.VM;
+using Org.BouncyCastle.Crypto.Generators;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -162,7 +163,7 @@ public static byte[] GetPrivateKeyFromNEP2(string nep2, string passphrase, int N
             byte[] addresshash = new byte[4];
             Buffer.BlockCopy(data, 3, addresshash, 0, 4);
             byte[] datapassphrase = Encoding.UTF8.GetBytes(passphrase);
-            byte[] derivedkey = SCrypt.DeriveKey(datapassphrase, addresshash, N, r, p, 64);
+            byte[] derivedkey = SCrypt.Generate(datapassphrase, addresshash, N, r, p, 64);
             Array.Clear(datapassphrase, 0, datapassphrase.Length);
             byte[] derivedhalf1 = derivedkey[..32];
             byte[] derivedhalf2 = derivedkey[32..];

diff --git a/src/neo/neo.csproj b/src/neo/neo.csproj
@@ -22,6 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Akka" Version="1.4.5" />
+    <PackageReference Include="BouncyCastle.NetCore" Version="1.8.8" />
     <PackageReference Include="K4os.Compression.LZ4" Version="1.1.11" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.2.1" />

diff --git a/tests/neo.UnitTests/Cryptography/UT_SCrypt.cs b/tests/neo.UnitTests/Cryptography/UT_SCrypt.cs
@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Cryptography;
+using Org.BouncyCastle.Crypto.Generators;
 
 namespace Neo.UnitTests.Cryptography
 {
@@ -11,7 +11,7 @@ public void DeriveKeyTest()
         {
             int N = 32, r = 2, p = 2;
 
-            var derivedkey = SCrypt.DeriveKey(new byte[] { 0x01, 0x02, 0x03 }, new byte[] { 0x04, 0x05, 0x06 }, N, r, p, 64).ToHexString();
+            var derivedkey = SCrypt.Generate(new byte[] { 0x01, 0x02, 0x03 }, new byte[] { 0x04, 0x05, 0x06 }, N, r, p, 64).ToHexString();
             Assert.AreEqual("b6274d3a81892c24335ab46a08ec16d040ac00c5943b212099a44b76a9b8102631ab988fa07fb35357cee7b0e3910098c0774c0e97399997676d890b2bf2bb25", derivedkey);
         }
     }

diff --git a/tests/neo.UnitTests/TestUtils.cs b/tests/neo.UnitTests/TestUtils.cs
@@ -82,10 +82,10 @@ public static NEP6Wallet GenerateTestWallet()
             JObject wallet = new JObject();
             wallet["name"] = "noname";
             wallet["version"] = new Version("3.0").ToString();
-            wallet["scrypt"] = new ScryptParameters(0, 0, 0).ToJson();
+            wallet["scrypt"] = new ScryptParameters(2, 1, 1).ToJson();
             wallet["accounts"] = new JArray();
             wallet["extra"] = null;
-            wallet.ToString().Should().Be("{\"name\":\"noname\",\"version\":\"3.0\",\"scrypt\":{\"n\":0,\"r\":0,\"p\":0},\"accounts\":[],\"extra\":null}");
+            wallet.ToString().Should().Be("{\"name\":\"noname\",\"version\":\"3.0\",\"scrypt\":{\"n\":2,\"r\":1,\"p\":1},\"accounts\":[],\"extra\":null}");
             return new NEP6Wallet(wallet);
         }