diff --git a/crypto/src/crypto/modes/gcm/GcmUtilities.cs b/crypto/src/crypto/modes/gcm/GcmUtilities.cs
index 1aa437fcd..ab2d81e06 100644
--- a/crypto/src/crypto/modes/gcm/GcmUtilities.cs
+++ b/crypto/src/crypto/modes/gcm/GcmUtilities.cs
@@ -17,9 +17,8 @@ namespace Org.BouncyCastle.Crypto.Modes.Gcm
internal abstract class GcmUtilities
{
#if NETCOREAPP3_0_OR_GREATER
- private static readonly Vector128<byte> EndianMask = Vector128.Create(
- (byte)0x07, (byte)0x06, (byte)0x05, (byte)0x04, (byte)0x03, (byte)0x02, (byte)0x01, (byte)0x00,
- (byte)0x0F, (byte)0x0E, (byte)0x0D, (byte)0x0C, (byte)0x0B, (byte)0x0A, (byte)0x09, (byte)0x08);
+ private static readonly Vector128<byte> EndianMask = Vector128.Create((byte)
+ 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08);
#endif
internal struct FieldElement
diff --git a/crypto/src/crypto/util/Pack.cs b/crypto/src/crypto/util/Pack.cs
index 98504a605..a12253e59 100644
--- a/crypto/src/crypto/util/Pack.cs
+++ b/crypto/src/crypto/util/Pack.cs
@@ -7,12 +7,8 @@ using System.Runtime.CompilerServices;
namespace Org.BouncyCastle.Crypto.Utilities
{
- internal sealed class Pack
+ internal static class Pack
{
- private Pack()
- {
- }
-
internal static void UInt16_To_BE(ushort n, byte[] bs)
{
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
diff --git a/crypto/src/math/ec/custom/gm/SM2P256V1FieldElement.cs b/crypto/src/math/ec/custom/gm/SM2P256V1FieldElement.cs
index 25cb24932..e3de6c594 100644
--- a/crypto/src/math/ec/custom/gm/SM2P256V1FieldElement.cs
+++ b/crypto/src/math/ec/custom/gm/SM2P256V1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.GM
public override ECFieldElement Invert()
{
- //return new SM2P256V1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat256.Create();
SM2P256V1Field.Inv(x, z);
return new SM2P256V1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP128R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP128R1FieldElement.cs
index e9235c2f3..1db449442 100644
--- a/crypto/src/math/ec/custom/sec/SecP128R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP128R1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- // return new SecP128R1FieldElement(toBigInteger().modInverse(Q));
uint[] z = Nat128.Create();
SecP128R1Field.Inv(x, z);
return new SecP128R1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP160R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP160R1FieldElement.cs
index 4876fafa9..a4307cbaf 100644
--- a/crypto/src/math/ec/custom/sec/SecP160R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP160R1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- // return new SecP160R1FieldElement(ToBigInteger().modInverse(Q));
uint[] z = Nat160.Create();
SecP160R1Field.Inv(x, z);
return new SecP160R1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP160R2FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP160R2FieldElement.cs
index 795fe3b2e..9237c0778 100644
--- a/crypto/src/math/ec/custom/sec/SecP160R2FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP160R2FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- // return new SecP160R2FieldElement(ToBigInteger().modInverse(Q));
uint[] z = Nat160.Create();
SecP160R2Field.Inv(x, z);
return new SecP160R2FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs
index c933ffc8d..a37bc1539 100644
--- a/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs
@@ -116,7 +116,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP192K1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat192.Create();
SecP192K1Field.Inv(x, z);
return new SecP192K1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs
index e61c2251b..a8c7ae83c 100644
--- a/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP192R1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat192.Create();
SecP192R1Field.Inv(x, z);
return new SecP192R1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs
index eb740419f..24de7112a 100644
--- a/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs
@@ -120,7 +120,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP224K1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat224.Create();
SecP224K1Field.Inv(x, z);
return new SecP224K1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs
index 013100dc3..e53f44164 100644
--- a/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs
@@ -116,7 +116,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP224R1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat224.Create();
SecP224R1Field.Inv(x, z);
return new SecP224R1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs
index 2bb83d5e9..055df0d06 100644
--- a/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP256K1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat256.Create();
SecP256K1Field.Inv(x, z);
return new SecP256K1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs
index 928461ec6..e09cd8c8d 100644
--- a/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP256R1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat256.Create();
SecP256R1Field.Inv(x, z);
return new SecP256R1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs
index d190c4ae9..33f251b76 100644
--- a/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP384R1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat.Create(12);
SecP384R1Field.Inv(x, z);
return new SecP384R1FieldElement(z);
diff --git a/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs b/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs
index 409352586..1169d41a9 100644
--- a/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs
+++ b/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs
@@ -115,7 +115,6 @@ namespace Org.BouncyCastle.Math.EC.Custom.Sec
public override ECFieldElement Invert()
{
- //return new SecP521R1FieldElement(ToBigInteger().ModInverse(Q));
uint[] z = Nat.Create(17);
SecP521R1Field.Inv(x, z);
return new SecP521R1FieldElement(z);
diff --git a/crypto/src/pqc/crypto/bike/BikeEngine.cs b/crypto/src/pqc/crypto/bike/BikeEngine.cs
index 94f073bbb..56c60f90a 100644
--- a/crypto/src/pqc/crypto/bike/BikeEngine.cs
+++ b/crypto/src/pqc/crypto/bike/BikeEngine.cs
@@ -22,7 +22,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Bike
private readonly int t;
//the shared secret size
- private readonly int l;
+ //private readonly int l;
// number of iterations in BGF decoder
private readonly int nbIter;
@@ -39,7 +39,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Bike
this.r = r;
this.w = w;
this.t = t;
- this.l = l;
+ //this.l = l;
this.nbIter = nbIter;
this.tau = tau;
this.hw = this.w / 2;
diff --git a/crypto/src/util/Arrays.cs b/crypto/src/util/Arrays.cs
index e8dd02148..936e510be 100644
--- a/crypto/src/util/Arrays.cs
+++ b/crypto/src/util/Arrays.cs
@@ -631,10 +631,7 @@ namespace Org.BouncyCastle.Utilities
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
public static void Fill<T>(Span<T> ts, T t)
{
- for (int i = 0; i < ts.Length; ++i)
- {
- ts[i] = t;
- }
+ ts.Fill(t);
}
#endif
|
