Skip to content

Commit b9d84ea

Browse files
authored
Migrate to official BouncyCastle.Cryptography (#64)
* Migrate to BouncyCastle.Cryptography * Fix culture in tests
1 parent aadb40d commit b9d84ea

5 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/Solana.Unity.Extensions/Models/TokenWallet/TokenQuantity.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Solana.Unity.Extensions.Models.TokenMint;
22
using System;
3+
using System.Globalization;
34
using System.Collections.Generic;
45
using System.Linq;
56
using System.Text;
@@ -74,9 +75,9 @@ internal TokenQuantity(TokenDef tokenDef,
7475
public override string ToString()
7576
{
7677
if (Symbol == TokenName)
77-
return $"{QuantityDecimal} {Symbol}";
78+
return $"{QuantityDecimal.ToString(CultureInfo.InvariantCulture)} {Symbol}";
7879
else
79-
return $"{QuantityDecimal} {Symbol} ({TokenName})";
80+
return $"{QuantityDecimal.ToString(CultureInfo.InvariantCulture)} {Symbol} ({TokenName})";
8081
}
8182

8283
/// <summary>

src/Solana.Unity.Extensions/Models/TokenWallet/TokenWalletBalance.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Solana.Unity.Extensions.Models.TokenMint;
22
using System;
3+
using System.Globalization;
34
using System.Collections.Generic;
45
using System.Linq;
56
using System.Text;
@@ -50,9 +51,9 @@ internal TokenWalletBalance(TokenDef tokenDef,
5051
public override string ToString()
5152
{
5253
if (Symbol == TokenName)
53-
return $"{QuantityDecimal} {Symbol}";
54+
return $"{QuantityDecimal.ToString(CultureInfo.InvariantCulture)} {Symbol}";
5455
else
55-
return $"{QuantityDecimal} {Symbol} ({TokenName})";
56+
return $"{QuantityDecimal.ToString(CultureInfo.InvariantCulture)} {Symbol} ({TokenName})";
5657
}
5758

5859
/// <summary>

src/Solana.Unity.KeyStore/Solana.Unity.KeyStore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9+
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
910
<PackageReference Include="Chaos.NaCl.Standard" Version="1.0.*" />
10-
<PackageReference Include="Portable.BouncyCastle" Version="1.9.*" />
1111
<PackageReference Include="IsExternalInit" Version="1.0.*" PrivateAssets="all" />
1212
<PackageReference Include="IndexRange" Version="1.0.*" />
1313
<PackageReference Include="Newtonsoft.Json" Version="13.*" PrivateAssets="all" />

src/Solana.Unity.Wallet/Bip39/Mnemonic.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ private static byte[] GenerateSeed(byte[] password, byte[] salt)
197197
{
198198
Pkcs5S2ParametersGenerator gen = new(new Sha512Digest());
199199
gen.Init(password, salt, 2048);
200-
return ((KeyParameter)gen.GenerateDerivedParameters(512)).GetKey();
200+
return ((KeyParameter)gen.GenerateDerivedMacParameters(512)).GetKey();
201201
}
202202

203203
/// <summary>

src/Solana.Unity.Wallet/Solana.Unity.Wallet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
1212
<_Parameter1>Solana.Unity.Wallet.Test</_Parameter1>
1313
</AssemblyAttribute>
14+
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
1415
<PackageReference Include="Chaos.NaCl.Standard" Version="1.0.*" />
15-
<PackageReference Include="Portable.BouncyCastle" Version="1.9.*" />
1616
<PackageReference Include="System.Memory" Version="4.5.*"/>
1717
<PackageReference Include="IndexRange" Version="1.0.*"/>
1818
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.*" />

0 commit comments

Comments
 (0)