Skip to content

Commit 62affe5

Browse files
juanfranblancojuanfranblanco
committed
BouncyCastle upgrade
1 parent adb2872 commit 62affe5

5 files changed

Lines changed: 31 additions & 39 deletions

File tree

‎buildConf/Frameworks.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,50 +10,50 @@
1010
<TargetUnityAOT>false</TargetUnityAOT>
1111
<TargetUnityAOT Condition="'$(TargetUnityNet461AOT)' == 'true' Or '$(TargetUnityNet472AOT)' == 'true'">true</TargetUnityAOT>
1212
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' != 'netstandard1.1'">1.6.1</NetStandardImplicitPackageVersion>
13-
<DefaultFrameworksUnitySupport Condition=" '$(TargetNet35)' == 'true' ">netstandard1.1;netstandard2.0;net35;net451;net461;net5.0;net8.0;net9.0</DefaultFrameworksUnitySupport>
14-
<DefaultFrameworksUnitySupport Condition=" '$(TargetNet35)' == 'false' ">netstandard1.1;netstandard2.0;net451;net461;net5.0;net8.0;net9.0</DefaultFrameworksUnitySupport>
13+
<DefaultFrameworksUnitySupport Condition=" '$(TargetNet35)' == 'true' ">netstandard1.1;netstandard2.0;net35;net451;net461;net6.0;net8.0;net9.0</DefaultFrameworksUnitySupport>
14+
<DefaultFrameworksUnitySupport Condition=" '$(TargetNet35)' == 'false' ">netstandard1.1;netstandard2.0;net451;net461;net6.0;net8.0;net9.0</DefaultFrameworksUnitySupport>
1515
<DefaultFrameworksUnitySupport Condition=" '$(TargetNet461)' == 'true'">net461</DefaultFrameworksUnitySupport>
1616
<DefaultFrameworksUnitySupport Condition=" '$(TargetNet472)' == 'true'">net472</DefaultFrameworksUnitySupport>
17-
<DefaultFrameworksUnitySupport Condition=" '$(TargetNetCore)'== 'true'">net5.0;net8.0;net9.0</DefaultFrameworksUnitySupport>
17+
<DefaultFrameworksUnitySupport Condition=" '$(TargetNetCore)'== 'true'">net6.0;net8.0;net9.0</DefaultFrameworksUnitySupport>
1818
<DefaultFrameworksUnitySupport Condition=" '$(TargetNetStandard)'== 'true'">netstandard2.0</DefaultFrameworksUnitySupport>
19-
<DefaultFrameworks>netstandard1.1;net451;net461;netstandard2.0;net5.0;net8.0;net9.0</DefaultFrameworks>
19+
<DefaultFrameworks>netstandard1.1;net451;net461;netstandard2.0;net6.0;net8.0;net9.0</DefaultFrameworks>
2020
<DefaultFrameworks Condition=" '$(TargetNet461)' == 'true'">net461</DefaultFrameworks>
2121
<DefaultFrameworks Condition=" '$(TargetNet472)' == 'true'">net472</DefaultFrameworks>
22-
<DefaultFrameworks Condition=" '$(TargetNetCore)' == 'true'">net5.0;net8.0;net9.0</DefaultFrameworks>
22+
<DefaultFrameworks Condition=" '$(TargetNetCore)' == 'true'">net6.0;net8.0;net9.0</DefaultFrameworks>
2323
<DefaultFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.0</DefaultFrameworks>
24-
<UIFrameworks>netstandard2.0;net5.0;net6.0;net472;net8.0;net9.0</UIFrameworks>
25-
<UIFrameworksCore>net5.0;net6.0;net8.0;net9.0</UIFrameworksCore>
24+
<UIFrameworks>netstandard2.0;net6.0;net472;net8.0;net9.0</UIFrameworks>
25+
<UIFrameworksCore>net6.0;net8.0;net9.0</UIFrameworksCore>
2626
<UIFrameworksBlazor>net6.0;net8.0;net9.0</UIFrameworksBlazor>
27-
<ENSFrameworks>net451;net461;netstandard2.0;net5.0;net8.0;net9.0</ENSFrameworks>
27+
<ENSFrameworks>net451;net461;netstandard2.0;net6.0;net8.0;net9.0</ENSFrameworks>
2828
<ENSFrameworks Condition=" '$(TargetNet461)' == 'true'">net461</ENSFrameworks>
2929
<ENSFrameworks Condition=" '$(TargetNet472)' == 'true'">net472</ENSFrameworks>
30-
<ENSFrameworks Condition=" '$(TargetNetCore)' == 'true'">net5.0;net8.0;net9.0</ENSFrameworks>
30+
<ENSFrameworks Condition=" '$(TargetNetCore)' == 'true'">net6.0;net8.0;net9.0</ENSFrameworks>
3131
<ENSFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.0</ENSFrameworks>
3232

3333
<HdWalletFrameworks>netstandard1.1;netstandard2.0;net452;net461;</HdWalletFrameworks>
3434
<HdWalletFrameworks Condition=" '$(TargetNet461)' == 'true'">net461;</HdWalletFrameworks>
3535
<HdWalletFrameworks Condition=" '$(TargetNet472)' == 'true'">net472;</HdWalletFrameworks>
3636
<HdWalletFrameworks Condition=" '$(TargetNetCore)' == 'true'">netstandard2.0</HdWalletFrameworks>
3737
<HdWalletFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.0</HdWalletFrameworks>
38-
<ExternalSignerFrameworks>netstandard2.0;net461;net5.0;net8.0;net9.0</ExternalSignerFrameworks>
38+
<ExternalSignerFrameworks>netstandard2.0;net461;net6.0;net8.0;net9.0</ExternalSignerFrameworks>
3939
<ExternalSignerFrameworks Condition=" '$(TargetNet461)' == 'true'">net461;</ExternalSignerFrameworks>
4040
<ExternalSignerFrameworks Condition=" '$(TargetNet472)' == 'true'">net472;</ExternalSignerFrameworks>
41-
<ExternalSignerFrameworks Condition=" '$(TargetNetCore)' == 'true'">net5.0;net8.0;net9.0</ExternalSignerFrameworks>
41+
<ExternalSignerFrameworks Condition=" '$(TargetNetCore)' == 'true'">net6.0;net8.0;net9.0</ExternalSignerFrameworks>
4242
<ExternalSignerFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.0;</ExternalSignerFrameworks>
4343
<UnityFrameworks>net461;net472;netstandard2.1</UnityFrameworks>
4444
<UnityFrameworks Condition=" '$(TargetNet461)' == 'true'">net461;</UnityFrameworks>
4545
<UnityFrameworks Condition=" '$(TargetNet472)' == 'true'">net472;</UnityFrameworks>
4646
<UnityFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.1;</UnityFrameworks>
47-
<IpcWebSocketsFrameworks>net461;netstandard1.3;netstandard2.0;net5.0;net8.0;net9.0</IpcWebSocketsFrameworks>
47+
<IpcWebSocketsFrameworks>net461;netstandard1.3;netstandard2.0;net6.0;net8.0;net9.0</IpcWebSocketsFrameworks>
4848
<IpcWebSocketsFrameworks Condition=" '$(TargetNet461)' == 'true'">net461;</IpcWebSocketsFrameworks>
4949
<IpcWebSocketsFrameworks Condition=" '$(TargetNet472)' == 'true'">net472;</IpcWebSocketsFrameworks>
50-
<IpcWebSocketsFrameworks Condition=" '$(TargetNetCore)' == 'true'">net5.0;net8.0;net9.0</IpcWebSocketsFrameworks>
50+
<IpcWebSocketsFrameworks Condition=" '$(TargetNetCore)' == 'true'">net6.0;net8.0;net9.0</IpcWebSocketsFrameworks>
5151
<IpcWebSocketsFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.0;</IpcWebSocketsFrameworks>
5252

53-
<ReactiveFrameworks>net461;netstandard2.0;net5.0;net8.0;net9.0</ReactiveFrameworks>
53+
<ReactiveFrameworks>net461;netstandard2.0;net6.0;net8.0;net9.0</ReactiveFrameworks>
5454
<ReactiveFrameworks Condition=" '$(TargetNet461)' == 'true'">net461;</ReactiveFrameworks>
5555
<ReactiveFrameworks Condition=" '$(TargetNet472)' == 'true'">net472;</ReactiveFrameworks>
56-
<ReactiveFrameworks Condition=" '$(TargetNetCore)' == 'true'">net5.0;net8.0;net9.0</ReactiveFrameworks>
56+
<ReactiveFrameworks Condition=" '$(TargetNetCore)' == 'true'">net6.0;net8.0;net9.0</ReactiveFrameworks>
5757
<ReactiveFrameworks Condition=" '$(TargetNetStandard)' == 'true'">netstandard2.0;</ReactiveFrameworks>
5858

5959
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -79,7 +79,7 @@
7979
</Reference>
8080
</ItemGroup>
8181

82-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'netstandard1.1' Or '$(TargetFramework)' == 'net35' Or '$(TargetFramework)' == 'netstandard2.0' ">
82+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' Or '$(TargetFramework)' == 'netstandard1.1' Or '$(TargetFramework)' == 'net35' Or '$(TargetFramework)' == 'netstandard2.0' ">
8383
<DefineConstants>$(DefineConstants);PCL</DefineConstants>
8484
</PropertyGroup>
8585

‎buildConf/net35.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<Reference Include="System" />
1313
<Reference Include="netstandard" />
1414
<PackageReference Include="TaskParallelLibrary" Version="1.0.2856" />
15-
<PackageReference Include="BouncyCastle" Version="1.8.2" />
1615
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
1716
<SpecificVersion>False</SpecificVersion>
1817
<HintPath>..\..\lib\Newtonsoft.Json.dll</HintPath>

‎src/Nethereum.KeyStore/Nethereum.KeyStore.csproj‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,28 @@
2222
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2323
</PropertyGroup>
2424

25-
<!--
26-
<ItemGroup Condition=" '$(TargetFramework)' != 'net35'
27-
And '$(TargetFramework)' != 'net451'
28-
And '$(TargetFramework)' != 'net461'
29-
And '$(TargetFramework)' != 'net472'
30-
And '$(TargetFramework)' != 'net6.0'
25+
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0'
3126
And '$(TargetFramework)' != 'net8.0'
3227
And '$(TargetFramework)' != 'net9.0'">
28+
3329
<PackageReference Include="Portable.BouncyCastle" Version="[1.8.2,2.0)" />
3430
</ItemGroup>
3531

32+
3633
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
37-
<PackageReference Include="BouncyCastle.Cryptography" Version="[2.4.0,3.0)" />
34+
<PackageReference Include="BouncyCastle.Cryptography" Version="[2.5.1,3.0)" />
3835
</ItemGroup>
3936

37+
4038
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' ">
4139
<DefineConstants>$(DefineConstants);LATEST_BOUNCYCASTLE</DefineConstants>
4240
</PropertyGroup>
43-
-->
4441

45-
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' And '$(TargetFramework)' != 'net451' And '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'net472'">
42+
<!--
43+
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' And '$(TargetFramework)' != 'net451' And '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'net472'">
4644
<PackageReference Include="Portable.BouncyCastle" Version="[1.8.2,2.0)" />
47-
</ItemGroup>
45+
</ItemGroup>
46+
-->
4847

4948
<PropertyGroup Condition=" '$(TargetFramework)' != 'net35' And '$(TargetUnityNet461AOT)' != 'true'">
5049
<SignAssembly>true</SignAssembly>

‎src/Nethereum.Signer/Crypto/ECDSASignature.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public ECDSASignature(byte[] derSig)
2929
var seq = decoder.ReadObject() as DerSequence;
3030
if (seq == null || seq.Count != 2)
3131
throw new FormatException(InvalidDERSignature);
32-
R = ((DerInteger) seq[0]).Value;
33-
S = ((DerInteger) seq[1]).Value;
32+
R = ((DerInteger)seq[0]).Value;
33+
S = ((DerInteger)seq[1]).Value;
3434
}
3535
catch (Exception ex)
3636
{

‎src/Nethereum.Signer/Nethereum.Signer.csproj‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@
2020
</ItemGroup>
2121

2222

23-
24-
<!--
25-
<ItemGroup Condition=" '$(TargetFramework)' != 'net35'
26-
And '$(TargetFramework)' != 'net451'
27-
And '$(TargetFramework)' != 'net461'
28-
And '$(TargetFramework)' != 'net472'
29-
And '$(TargetFramework)' != 'net6.0'
23+
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0'
3024
And '$(TargetFramework)' != 'net8.0'
3125
And '$(TargetFramework)' != 'net9.0'">
3226

@@ -35,19 +29,19 @@
3529

3630

3731
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
38-
<PackageReference Include="BouncyCastle.Cryptography" Version="[2.4.0,3.0)" />
32+
<PackageReference Include="BouncyCastle.Cryptography" Version="[2.5.1,3.0)" />
3933
</ItemGroup>
4034

4135

4236
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0' ">
4337
<DefineConstants>$(DefineConstants);LATEST_BOUNCYCASTLE</DefineConstants>
4438
</PropertyGroup>
45-
-->
4639

40+
<!--
4741
<ItemGroup Condition=" '$(TargetFramework)' != 'net35' And '$(TargetFramework)' != 'net451' And '$(TargetFramework)' != 'net461' And '$(TargetFramework)' != 'net472'">
4842
<PackageReference Include="Portable.BouncyCastle" Version="[1.8.2,2.0)" />
4943
</ItemGroup>
50-
44+
-->
5145
<PropertyGroup Condition=" '$(TargetFramework)' != 'net35' And '$(TargetUnityNet461AOT)' != 'true' And '$(TargetUnityNet472AOT)' != 'true'">
5246
<SignAssembly>true</SignAssembly>
5347
<AssemblyOriginatorKeyFile>..\..\NethereumKey.snk</AssemblyOriginatorKeyFile>

0 commit comments

Comments
 (0)