1 files changed, 34 insertions, 17 deletions

diff --git a/src/common/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h
index 509a63b6fe9..da4b43b30a5 100644
--- a/src/common/Cryptography/BigNumber.h
+++ b/src/common/Cryptography/BigNumber.h
@@ -32,17 +32,19 @@ class TC_COMMON_API BigNumber
         BigNumber();
         BigNumber(BigNumber const& bn);
         BigNumber(uint32 v) : BigNumber() { SetDword(v); }
+        BigNumber(int32 v) : BigNumber() { SetDword(v); }
         BigNumber(std::string const& v) : BigNumber() { SetHexStr(v); }
         template <size_t Size>
         BigNumber(std::array<uint8, Size> const& v, bool littleEndian = true) : BigNumber() { SetBinary(v.data(), Size, littleEndian); }
 
         ~BigNumber();
 
+        void SetDword(int32);
         void SetDword(uint32);
         void SetQword(uint64);
         void SetBinary(uint8 const* bytes, int32 len, bool littleEndian = true);
         template <typename Container>
-        auto SetBinary(Container const& c, bool littleEndian = true) -> std::enable_if_t<!std::is_pointer_v<std::decay_t<Container>>> { SetBinary(advstd::data(c), advstd::size(c), littleEndian); }
+        auto SetBinary(Container const& c, bool littleEndian = true) -> std::enable_if_t<!advstd::is_pointer_v<std::decay_t<Container>>> { SetBinary(advstd::data(c), advstd::size(c), littleEndian); }
         bool SetHexStr(char const* str);
         bool SetHexStr(std::string const& str) { return SetHexStr(str.c_str()); }
 
@@ -50,52 +52,67 @@ class TC_COMMON_API BigNumber
 
         BigNumber& operator=(BigNumber const& bn);
 
-        BigNumber operator+=(BigNumber const& bn);
-        BigNumber operator+(BigNumber const& bn)
+        BigNumber& operator+=(BigNumber const& bn);
+        BigNumber operator+(BigNumber const& bn) const
         {
             BigNumber t(*this);
             return t += bn;
         }
 
-        BigNumber operator-=(BigNumber const& bn);
-        BigNumber operator-(BigNumber const& bn)
+        BigNumber& operator-=(BigNumber const& bn);
+        BigNumber operator-(BigNumber const& bn) const
         {
             BigNumber t(*this);
             return t -= bn;
         }
 
-        BigNumber operator*=(BigNumber const& bn);
-        BigNumber operator*(BigNumber const& bn)
+        BigNumber& operator*=(BigNumber const& bn);
+        BigNumber operator*(BigNumber const& bn) const
         {
             BigNumber t(*this);
             return t *= bn;
         }
 
-        BigNumber operator/=(BigNumber const& bn);
-        BigNumber operator/(BigNumber const& bn)
+        BigNumber& operator/=(BigNumber const& bn);
+        BigNumber operator/(BigNumber const& bn) const
         {
             BigNumber t(*this);
             return t /= bn;
         }
 
-        BigNumber operator%=(BigNumber const& bn);
-        BigNumber operator%(BigNumber const& bn)
+        BigNumber& operator%=(BigNumber const& bn);
+        BigNumber operator%(BigNumber const& bn) const
         {
             BigNumber t(*this);
             return t %= bn;
         }
 
+        BigNumber& operator<<=(int n);
+        BigNumber operator<<(int n) const
+        {
+            BigNumber t(*this);
+            return t <<= n;
+        }
+
+        int CompareTo(BigNumber const& bn) const;
+        bool operator<=(BigNumber const& bn) const { return (CompareTo(bn) <= 0); }
+        bool operator==(BigNumber const& bn) const { return (CompareTo(bn) == 0); }
+        bool operator>=(BigNumber const& bn) const { return (CompareTo(bn) >= 0); }
+        bool operator<(BigNumber const& bn) const { return (CompareTo(bn) < 0); }
+        bool operator>(BigNumber const& bn) const { return (CompareTo(bn) > 0); }
+
         bool IsZero() const;
         bool IsNegative() const;
 
-        BigNumber ModExp(BigNumber const& bn1, BigNumber const& bn2);
-        BigNumber Exp(BigNumber const&);
+        BigNumber ModExp(BigNumber const& bn1, BigNumber const& bn2) const;
+        BigNumber Exp(BigNumber const&) const;
 
-        int32 GetNumBytes(void) const;
+        int32 GetNumBytes() const;
 
-        struct bignum_st *BN() { return _bn; }
+        struct bignum_st* BN() { return _bn; }
+        struct bignum_st const* BN() const { return _bn; }
 
-        uint32 AsDword();
+        uint32 AsDword() const;
 
         void GetBytes(uint8* buf, size_t bufsize, bool littleEndian = true) const;
         std::vector<uint8> ToByteVector(int32 minSize = 0, bool littleEndian = true) const;
@@ -112,7 +129,7 @@ class TC_COMMON_API BigNumber
         std::string AsDecStr() const;
 
     private:
-        struct bignum_st *_bn;
+        struct bignum_st* _bn;
 
 };
 #endif