work around bouncy castle interface compatibility break

bcgit/bc-csharp#447
Sphere10 · May 3, 2024 · c742b7f · c742b7f
1 parent 886a068
commit c742b7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/tests/Hydrogen.CryptoEx.Tests/ECDSATests.cs b/tests/Hydrogen.CryptoEx.Tests/ECDSATests.cs
@@ -63,12 +63,13 @@ private static byte[] R_And_S_To_DerSig(BigInteger[] rs) {
 			throw new ArgumentException(InvalidRAndSSignature, nameof(rs));
 		}
 
-		var outStream = new MemoryStream();
-		var generator = new DerSequenceGenerator(outStream);
-		generator.AddObject(new DerInteger(rs[0]));
-		generator.AddObject(new DerInteger(rs[1]));
-		//generator.Close();
-		return outStream.ToArray();
+		using (var outputStream = new MemoryStream()) {
+			using (var sequenceGenerator = new DerSequenceGenerator(outputStream)) {
+				sequenceGenerator.AddObject(new DerInteger(rs[0]));
+				sequenceGenerator.AddObject(new DerInteger(rs[1]));
+			}
+			return outputStream.ToArray();
+		}
 	}
 
 	public static byte[] CanonicalizeSig(BigInteger order, byte[] sig) {

diff --git a/tests/Hydrogen.CryptoEx.Tests/Hydrogen.CryptoEx.Tests.csproj b/tests/Hydrogen.CryptoEx.Tests/Hydrogen.CryptoEx.Tests.csproj
@@ -34,4 +34,13 @@
       </EmbeddedResource>
     </ItemGroup>
 
+	<!-- In current version of BouncyCastle.Cryptography there is a problem with finding interfaces implementations. 
+	     See here https://github.com/bcgit/bc-csharp/issues/447 for more details. -->
+	<ItemGroup>
+		<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" ExcludeAssets="Compile" GeneratePathProperty="true" />
+		<Reference Include="BouncyCastle.Cryptography">
+			<HintPath>$(PkgBouncyCastle_Cryptography)\lib\netstandard2.0\BouncyCastle.Cryptography.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+
 </Project>