From 7c718c3952a341cac0f38e18ddb3e4f82cc9f8b8 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Sat, 29 Oct 2022 18:57:05 +0700 Subject: Release preparations --- crypto/src/BouncyCastle.Crypto.csproj | 38 +++++++++++++++++++--- crypto/test/BouncyCastle.Crypto.Tests.csproj | 14 +++++--- crypto/test/src/crypto/prng/test/CtrDrbgTest.cs | 2 +- .../crypto/prng/test/TestEntropySourceProvider.cs | 2 +- crypto/test/src/crypto/test/AesX86Test.cs | 6 ++-- .../src/crypto/test/BlockCipherMonteCarloTest.cs | 2 +- .../test/src/crypto/test/BlockCipherVectorTest.cs | 2 +- crypto/test/src/crypto/test/DigestTest.cs | 4 +-- crypto/test/src/crypto/test/Haraka256DigestTest.cs | 2 +- crypto/test/src/crypto/test/Haraka512DigestTest.cs | 2 +- crypto/test/src/crypto/test/TupleHashTest.cs | 4 +-- crypto/test/src/security/test/SecureRandomTest.cs | 8 ++--- 12 files changed, 61 insertions(+), 25 deletions(-) (limited to 'crypto') diff --git a/crypto/src/BouncyCastle.Crypto.csproj b/crypto/src/BouncyCastle.Crypto.csproj index ee977cce8..44925aebd 100644 --- a/crypto/src/BouncyCastle.Crypto.csproj +++ b/crypto/src/BouncyCastle.Crypto.csproj @@ -1,17 +1,36 @@  - net6.0;netstandard2.0;net451 + net6.0;netstandard2.0;net462 Org.BouncyCastle ..\..\BouncyCastle.snk true + 1591 + + + Legion of the Bouncy Castle Inc. + Copyright © Legion of the Bouncy Castle Inc. 2000-2022 + embedded + BouncyCastle.NET is a popular cryptography library for .NET + true + https://www.bouncycastle.org/images/csharp_logo.gif + BouncyCastle.Cryptography + License.html + https://www.bouncycastle.org/csharp/ + https://www.bouncycastle.org/csharp/ + bouncycastle cryptography dtls encryption security tls + BouncyCastle.NET + + git + https://github.com/bcgit/bc-csharp + BouncyCastle.NET Cryptography - + DEBUG;TRACE - + true @@ -20,12 +39,23 @@ + + + + True + \ + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/crypto/test/BouncyCastle.Crypto.Tests.csproj b/crypto/test/BouncyCastle.Crypto.Tests.csproj index 1b752ad5c..3c9b88328 100644 --- a/crypto/test/BouncyCastle.Crypto.Tests.csproj +++ b/crypto/test/BouncyCastle.Crypto.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;netcoreapp2.1;net462 + net6.0;netcoreapp3.1;net472;net462 false ..\..\BouncyCastle.snk true @@ -9,11 +9,11 @@ 1591 - + DEBUG;TRACE - + DEBUG;TRACE @@ -23,10 +23,16 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + + TargetFramework=netstandard2.0 + diff --git a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs b/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs index 047405c77..23dabf7cb 100644 --- a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs +++ b/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs @@ -507,7 +507,7 @@ namespace Org.BouncyCastle.Crypto.Prng.Test return cipher.ProcessBlock(input, inOff, output, outOff); } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER public int ProcessBlock(ReadOnlySpan input, Span output) diff --git a/crypto/test/src/crypto/prng/test/TestEntropySourceProvider.cs b/crypto/test/src/crypto/prng/test/TestEntropySourceProvider.cs index 9ebbb7ccd..ae80b3dbe 100644 --- a/crypto/test/src/crypto/prng/test/TestEntropySourceProvider.cs +++ b/crypto/test/src/crypto/prng/test/TestEntropySourceProvider.cs @@ -48,7 +48,7 @@ namespace Org.BouncyCastle.Crypto.Prng.Test return rv; } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER int IEntropySource.GetEntropy(Span output) diff --git a/crypto/test/src/crypto/test/AesX86Test.cs b/crypto/test/src/crypto/test/AesX86Test.cs index 9610c4baa..fc5a92545 100644 --- a/crypto/test/src/crypto/test/AesX86Test.cs +++ b/crypto/test/src/crypto/test/AesX86Test.cs @@ -1,6 +1,6 @@ -#if NETCOREAPP3_0_OR_GREATER -using System; - +// NOTE: .NET Core 3.1 is tested against our .NET Standard 2.0 assembly. +//#if NETCOREAPP3_0_OR_GREATER +#if NET6_0_OR_GREATER using NUnit.Framework; using Org.BouncyCastle.Crypto.Engines; diff --git a/crypto/test/src/crypto/test/BlockCipherMonteCarloTest.cs b/crypto/test/src/crypto/test/BlockCipherMonteCarloTest.cs index 1a7f04702..dea6e66b1 100644 --- a/crypto/test/src/crypto/test/BlockCipherMonteCarloTest.cs +++ b/crypto/test/src/crypto/test/BlockCipherMonteCarloTest.cs @@ -77,7 +77,7 @@ namespace Org.BouncyCastle.Crypto.Tests Fail("failed reversal"); } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER cipher.Init(true, param); diff --git a/crypto/test/src/crypto/test/BlockCipherVectorTest.cs b/crypto/test/src/crypto/test/BlockCipherVectorTest.cs index 58a138982..b1a2c3051 100644 --- a/crypto/test/src/crypto/test/BlockCipherVectorTest.cs +++ b/crypto/test/src/crypto/test/BlockCipherVectorTest.cs @@ -71,7 +71,7 @@ namespace Org.BouncyCastle.Crypto.Tests Fail("failed reversal got " + Hex.ToHexString(outBytes)); } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER cipher.Init(true, param); diff --git a/crypto/test/src/crypto/test/DigestTest.cs b/crypto/test/src/crypto/test/DigestTest.cs index 1809c07fb..dddd19cad 100644 --- a/crypto/test/src/crypto/test/DigestTest.cs +++ b/crypto/test/src/crypto/test/DigestTest.cs @@ -185,7 +185,7 @@ namespace Org.BouncyCastle.Crypto.Tests internal static void SpanConsistencyTests(SimpleTest test, IDigest digest) { - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER @@ -204,7 +204,7 @@ namespace Org.BouncyCastle.Crypto.Tests internal static void SpanConsistencyTest(SimpleTest test, IDigest digest, byte[] buf, int off, int len) { - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER digest.Reset(); diff --git a/crypto/test/src/crypto/test/Haraka256DigestTest.cs b/crypto/test/src/crypto/test/Haraka256DigestTest.cs index 18ff65ddc..08cae6d57 100644 --- a/crypto/test/src/crypto/test/Haraka256DigestTest.cs +++ b/crypto/test/src/crypto/test/Haraka256DigestTest.cs @@ -200,7 +200,7 @@ namespace Org.BouncyCastle.Crypto.Tests private void SpanConsistencyTests() { - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER // Span-based API consistency checks diff --git a/crypto/test/src/crypto/test/Haraka512DigestTest.cs b/crypto/test/src/crypto/test/Haraka512DigestTest.cs index 1ef178222..5f84a6328 100644 --- a/crypto/test/src/crypto/test/Haraka512DigestTest.cs +++ b/crypto/test/src/crypto/test/Haraka512DigestTest.cs @@ -202,7 +202,7 @@ namespace Org.BouncyCastle.Crypto.Tests private void SpanConsistencyTests() { - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER // Span-based API consistency checks diff --git a/crypto/test/src/crypto/test/TupleHashTest.cs b/crypto/test/src/crypto/test/TupleHashTest.cs index 8eaa97e5c..a492dd58c 100644 --- a/crypto/test/src/crypto/test/TupleHashTest.cs +++ b/crypto/test/src/crypto/test/TupleHashTest.cs @@ -118,7 +118,7 @@ namespace Org.BouncyCastle.Crypto.Tests internal void SpanConsistencyTests() { - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER IDigest digest1 = new TupleHash(128, new byte[0]); @@ -139,7 +139,7 @@ namespace Org.BouncyCastle.Crypto.Tests internal void SpanConsistencyTest(IDigest digest1, IDigest digest2, byte[] buf, int off, int len) { - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER digest1.Reset(); diff --git a/crypto/test/src/security/test/SecureRandomTest.cs b/crypto/test/src/security/test/SecureRandomTest.cs index 11ebeb276..caba7a37a 100644 --- a/crypto/test/src/security/test/SecureRandomTest.cs +++ b/crypto/test/src/security/test/SecureRandomTest.cs @@ -143,7 +143,7 @@ namespace Org.BouncyCastle.Security.Tests return false; } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER { @@ -226,7 +226,7 @@ namespace Org.BouncyCastle.Security.Tests return chi2; } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER private static double MeasureChiSquaredSpan(SecureRandom random, int rounds) @@ -314,7 +314,7 @@ namespace Org.BouncyCastle.Security.Tests public abstract void NextBytes(byte[] bytes, int start, int len); - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER public abstract void NextBytes(Span bytes); @@ -336,7 +336,7 @@ namespace Org.BouncyCastle.Security.Tests Arrays.Fill(bytes, start, start + len, b); } - // NOTE: .NET Core 2.1 has Span, but is tested against our .NET Standard 2.0 assembly. + // NOTE: .NET Core 3.1 has Span, but is tested against our .NET Standard 2.0 assembly. //#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER #if NET6_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER public override void NextBytes(Span bytes) -- cgit 1.4.1