diff --git a/crypto/src/math/ec/ECAlgorithms.cs b/crypto/src/math/ec/ECAlgorithms.cs
index 4976b73b0..64e68fccc 100644
--- a/crypto/src/math/ec/ECAlgorithms.cs
+++ b/crypto/src/math/ec/ECAlgorithms.cs
@@ -168,8 +168,9 @@ namespace Org.BouncyCastle.Math.EC
}
/**
- * Simple shift-and-add multiplication. Serves as reference implementation
- * to verify (possibly faster) implementations, and for very small scalars.
+ * Simple shift-and-add multiplication. Serves as reference implementation to verify (possibly
+ * faster) implementations, and for very small scalars. CAUTION: This implementation is NOT
+ * constant-time in any way. It is only intended to be used for diagnostics.
*
* @param p
* The point to multiply.
diff --git a/crypto/src/math/ec/multiplier/DoubleAddMultiplier.cs b/crypto/src/math/ec/multiplier/DoubleAddMultiplier.cs
index 18a72c0a2..6648727f9 100644
--- a/crypto/src/math/ec/multiplier/DoubleAddMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/DoubleAddMultiplier.cs
@@ -1,5 +1,8 @@
-namespace Org.BouncyCastle.Math.EC.Multiplier
+using System;
+
+namespace Org.BouncyCastle.Math.EC.Multiplier
{
+ [Obsolete("Will be removed")]
public class DoubleAddMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/MixedNafR2LMultiplier.cs b/crypto/src/math/ec/multiplier/MixedNafR2LMultiplier.cs
index a4c201832..2bed8920c 100644
--- a/crypto/src/math/ec/multiplier/MixedNafR2LMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/MixedNafR2LMultiplier.cs
@@ -6,6 +6,7 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
* Class implementing the NAF (Non-Adjacent Form) multiplication algorithm (right-to-left) using
* mixed coordinates.
*/
+ [Obsolete("Will be removed")]
public class MixedNafR2LMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/MontgomeryLadderMultiplier.cs b/crypto/src/math/ec/multiplier/MontgomeryLadderMultiplier.cs
index e2470a383..45df2fdae 100644
--- a/crypto/src/math/ec/multiplier/MontgomeryLadderMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/MontgomeryLadderMultiplier.cs
@@ -1,5 +1,8 @@
-namespace Org.BouncyCastle.Math.EC.Multiplier
+using System;
+
+namespace Org.BouncyCastle.Math.EC.Multiplier
{
+ [Obsolete("Will be removed")]
public class MontgomeryLadderMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/NafL2RMultiplier.cs b/crypto/src/math/ec/multiplier/NafL2RMultiplier.cs
index ac80cf905..d41a0d651 100644
--- a/crypto/src/math/ec/multiplier/NafL2RMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/NafL2RMultiplier.cs
@@ -1,8 +1,11 @@
+using System;
+
namespace Org.BouncyCastle.Math.EC.Multiplier
{
/**
* Class implementing the NAF (Non-Adjacent Form) multiplication algorithm (left-to-right).
*/
+ [Obsolete("Will be removed")]
public class NafL2RMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/NafR2LMultiplier.cs b/crypto/src/math/ec/multiplier/NafR2LMultiplier.cs
index 1fa69fae8..8157cf05e 100644
--- a/crypto/src/math/ec/multiplier/NafR2LMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/NafR2LMultiplier.cs
@@ -1,8 +1,11 @@
-namespace Org.BouncyCastle.Math.EC.Multiplier
+using System;
+
+namespace Org.BouncyCastle.Math.EC.Multiplier
{
/**
* Class implementing the NAF (Non-Adjacent Form) multiplication algorithm (right-to-left).
*/
+ [Obsolete("Will be removed")]
public class NafR2LMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/ReferenceMultiplier.cs b/crypto/src/math/ec/multiplier/ReferenceMultiplier.cs
index 4848ada39..40563cdc7 100644
--- a/crypto/src/math/ec/multiplier/ReferenceMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/ReferenceMultiplier.cs
@@ -1,5 +1,8 @@
+using System;
+
namespace Org.BouncyCastle.Math.EC.Multiplier
{
+ [Obsolete("Will be removed")]
public class ReferenceMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs b/crypto/src/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs
index 554ac61b3..1c7a5d104 100644
--- a/crypto/src/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs
@@ -1,5 +1,8 @@
-namespace Org.BouncyCastle.Math.EC.Multiplier
+using System;
+
+namespace Org.BouncyCastle.Math.EC.Multiplier
{
+ [Obsolete("Will be removed")]
public class ZSignedDigitL2RMultiplier
: AbstractECMultiplier
{
diff --git a/crypto/src/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs b/crypto/src/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs
index 91c06cbb8..46d234c37 100644
--- a/crypto/src/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs
@@ -1,5 +1,8 @@
-namespace Org.BouncyCastle.Math.EC.Multiplier
+using System;
+
+namespace Org.BouncyCastle.Math.EC.Multiplier
{
+ [Obsolete("Will be removed")]
public class ZSignedDigitR2LMultiplier
: AbstractECMultiplier
{
|
