Skip to content

Commit 9a950b5

Browse files
mus65Rob-Hague
andauthored
Replace internal BouncyCastle with NuGet package (#1370)
* Replace internal BouncyCastle with NuGet package * fix NullReference in KeyExchangeECDH for some reason d24fe20 introduced its own names here which (as far as I can see) were never part of the original BouncyCastle. Switched to the correct names. * Update to BouncyCastle 2.3.1 * Update to BouncyCastle 2.4.0 * fix Conflict between Zlib class and BouncyCastle namespace CA1724: The type name Zlib conflicts in whole or in part with the namespace name 'Org.BouncyCastle.Utilities.Zlib'. Change either name to eliminate the conflict. We can't change either, so suppress the warning. --------- Co-authored-by: Rob Hague <rob.hague00@gmail.com>
1 parent 5ab8f3e commit 9a950b5

File tree

79 files changed

+28
-18134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+28
-18134
lines changed

src/Renci.SshNet/Compression/Zlib.cs

+2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ namespace Renci.SshNet.Compression
77
/// <summary>
88
/// Represents the "zlib" compression algorithm.
99
/// </summary>
10+
#pragma warning disable CA1724 // Type names should not match namespaces
1011
public class Zlib : Compressor
12+
#pragma warning restore CA1724 // Type names should not match namespaces
1113
{
1214
private readonly ZLibStream _compressor;
1315
private readonly ZLibStream _decompressor;

src/Renci.SshNet/Renci.SshNet.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
<PackageReference Include="System.Memory" Version="4.5.5" />
4141
</ItemGroup>
4242

43+
<ItemGroup>
44+
<PackageReference Include="BouncyCastle.Cryptography" Version="[2.4.0,)" />
45+
</ItemGroup>
46+
4347
<ItemGroup>
4448
<None Include="..\..\images\logo\png\SS-NET-icon-h500.png">
4549
<Pack>True</Pack>

src/Renci.SshNet/Security/BouncyCastle/.editorconfig

-10
This file was deleted.

src/Renci.SshNet/Security/BouncyCastle/asn1/sec/SECNamedCurves.cs

-121
This file was deleted.

src/Renci.SshNet/Security/BouncyCastle/asn1/x9/X9Curve.cs

-40
This file was deleted.

src/Renci.SshNet/Security/BouncyCastle/asn1/x9/X9ECParameters.cs

-93
This file was deleted.

src/Renci.SshNet/Security/BouncyCastle/asn1/x9/X9ECParametersHolder.cs

-25
This file was deleted.

src/Renci.SshNet/Security/BouncyCastle/asn1/x9/X9ECPoint.cs

-57
This file was deleted.

0 commit comments

Comments
 (0)