diff options
Diffstat (limited to 'src/lib/math/bigint')
-rw-r--r-- | src/lib/math/bigint/big_code.cpp | 51 | ||||
-rw-r--r-- | src/lib/math/bigint/bigint.cpp | 2 | ||||
-rw-r--r-- | src/lib/math/bigint/bigint.h | 101 |
3 files changed, 138 insertions, 16 deletions
diff --git a/src/lib/math/bigint/big_code.cpp b/src/lib/math/bigint/big_code.cpp index c42819965..8bbbdbe2b 100644 --- a/src/lib/math/bigint/big_code.cpp +++ b/src/lib/math/bigint/big_code.cpp @@ -12,6 +12,35 @@ namespace Botan { +std::string BigInt::to_dec_string() const + { + BigInt copy = *this; + copy.set_sign(Positive); + + BigInt remainder; + std::vector<uint8_t> digits; + + while(copy > 0) + { + divide(copy, 10, copy, remainder); + digits.push_back(static_cast<uint8_t>(remainder.word_at(0))); + } + + std::string s; + + for(auto i = digits.rbegin(); i != digits.rend(); ++i) + { + s.push_back(Charset::digit2char(*i)); + } + + return s; + } + +std::string BigInt::to_hex_string() const + { + return hex_encode(BigInt::encode(*this)); + } + /* * Encode a BigInt */ @@ -53,12 +82,15 @@ void BigInt::encode(uint8_t output[], const BigInt& n, Base base) */ std::vector<uint8_t> BigInt::encode(const BigInt& n, Base base) { + if(base == Binary) + return BigInt::encode(n); + std::vector<uint8_t> output(n.encoded_size(base)); encode(output.data(), n, base); - if(base != Binary) - for(size_t j = 0; j != output.size(); ++j) - if(output[j] == 0) - output[j] = '0'; + for(size_t j = 0; j != output.size(); ++j) + if(output[j] == 0) + output[j] = '0'; + return output; } @@ -67,12 +99,15 @@ std::vector<uint8_t> BigInt::encode(const BigInt& n, Base base) */ secure_vector<uint8_t> BigInt::encode_locked(const BigInt& n, Base base) { + if(base == Binary) + return BigInt::encode_locked(n); + secure_vector<uint8_t> output(n.encoded_size(base)); encode(output.data(), n, base); - if(base != Binary) - for(size_t j = 0; j != output.size(); ++j) - if(output[j] == 0) - output[j] = '0'; + for(size_t j = 0; j != output.size(); ++j) + if(output[j] == 0) + output[j] = '0'; + return output; } diff --git a/src/lib/math/bigint/bigint.cpp b/src/lib/math/bigint/bigint.cpp index 5283c893c..b996f0fa2 100644 --- a/src/lib/math/bigint/bigint.cpp +++ b/src/lib/math/bigint/bigint.cpp @@ -96,7 +96,7 @@ BigInt::BigInt(const uint8_t input[], size_t length, Base base) BigInt::BigInt(const uint8_t buf[], size_t length, size_t max_bits) { const size_t max_bytes = std::min(length, (max_bits + 7) / 8); - *this = decode(buf, max_bytes); + binary_decode(buf, max_bytes); const size_t b = this->bits(); if(b > max_bits) diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h index 8e09e4283..e7eca06af 100644 --- a/src/lib/math/bigint/bigint.h +++ b/src/lib/math/bigint/bigint.h @@ -79,6 +79,13 @@ class BOTAN_PUBLIC_API(2,0) BigInt final /** * Create a BigInt from an integer in a byte array + * @param vec the byte vector holding the value + */ + template<typename Alloc> + explicit BigInt(const std::vector<uint8_t, Alloc>& vec) : BigInt(vec.data(), vec.size()) {} + + /** + * Create a BigInt from an integer in a byte array * @param buf the byte array holding the value * @param length size of buf * @param base is the number base of the integer in buf @@ -423,6 +430,17 @@ class BOTAN_PUBLIC_API(2,0) BigInt final uint32_t to_u32bit() const; /** + * Convert this value to a decimal string. + * Warning: decimal conversions are relatively slow + */ + std::string to_dec_string() const; + + /** + * Convert this value to a hexadecimal string. + */ + std::string to_hex_string() const; + + /** * @param n the offset to get a byte from * @result byte at offset n */ @@ -655,10 +673,76 @@ class BOTAN_PUBLIC_API(2,0) BigInt final /** * Encode the integer value from a BigInt to a std::vector of bytes * @param n the BigInt to use as integer source + * @result secure_vector of bytes containing the bytes of the integer + */ + static std::vector<uint8_t> encode(const BigInt& n) + { + std::vector<uint8_t> output(n.bytes()); + n.binary_encode(output.data()); + return output; + } + + /** + * Encode the integer value from a BigInt to a secure_vector of bytes + * @param n the BigInt to use as integer source + * @result secure_vector of bytes containing the bytes of the integer + */ + static secure_vector<uint8_t> encode_locked(const BigInt& n) + { + secure_vector<uint8_t> output(n.bytes()); + n.binary_encode(output.data()); + return output; + } + + /** + * Encode the integer value from a BigInt to a byte array + * @param buf destination byte array for the encoded integer + * @param n the BigInt to use as integer source + */ + static void encode(uint8_t buf[], const BigInt& n) + { + n.binary_encode(buf); + } + + /** + * Create a BigInt from an integer in a byte array + * @param buf the binary value to load + * @param length size of buf + * @result BigInt representing the integer in the byte array + */ + static BigInt decode(const uint8_t buf[], size_t length) + { + return BigInt(buf, length); + } + + /** + * Create a BigInt from an integer in a byte array + * @param buf the binary value to load + * @result BigInt representing the integer in the byte array + */ + static BigInt decode(const secure_vector<uint8_t>& buf) + { + return BigInt(buf); + } + + /** + * Create a BigInt from an integer in a byte array + * @param buf the binary value to load + * @param base number-base of the integer in buf + * @result BigInt representing the integer in the byte array + */ + static BigInt decode(const std::vector<uint8_t>& buf) + { + return BigInt(buf); + } + + /** + * Encode the integer value from a BigInt to a std::vector of bytes + * @param n the BigInt to use as integer source * @param base number-base of resulting byte array representation * @result secure_vector of bytes containing the integer with given base */ - static std::vector<uint8_t> encode(const BigInt& n, Base base = Binary); + static std::vector<uint8_t> encode(const BigInt& n, Base base); /** * Encode the integer value from a BigInt to a secure_vector of bytes @@ -667,7 +751,7 @@ class BOTAN_PUBLIC_API(2,0) BigInt final * @result secure_vector of bytes containing the integer with given base */ static secure_vector<uint8_t> encode_locked(const BigInt& n, - Base base = Binary); + Base base); /** * Encode the integer value from a BigInt to a byte array @@ -676,7 +760,7 @@ class BOTAN_PUBLIC_API(2,0) BigInt final * @param n the BigInt to use as integer source * @param base number-base of resulting byte array representation */ - static void encode(uint8_t buf[], const BigInt& n, Base base = Binary); + static void encode(uint8_t buf[], const BigInt& n, Base base); /** * Create a BigInt from an integer in a byte array @@ -686,7 +770,7 @@ class BOTAN_PUBLIC_API(2,0) BigInt final * @result BigInt representing the integer in the byte array */ static BigInt decode(const uint8_t buf[], size_t length, - Base base = Binary); + Base base); /** * Create a BigInt from an integer in a byte array @@ -695,8 +779,10 @@ class BOTAN_PUBLIC_API(2,0) BigInt final * @result BigInt representing the integer in the byte array */ static BigInt decode(const secure_vector<uint8_t>& buf, - Base base = Binary) + Base base) { + if(base == Binary) + return BigInt(buf); return BigInt::decode(buf.data(), buf.size(), base); } @@ -706,9 +792,10 @@ class BOTAN_PUBLIC_API(2,0) BigInt final * @param base number-base of the integer in buf * @result BigInt representing the integer in the byte array */ - static BigInt decode(const std::vector<uint8_t>& buf, - Base base = Binary) + static BigInt decode(const std::vector<uint8_t>& buf, Base base) { + if(base == Binary) + return BigInt(buf); return BigInt::decode(buf.data(), buf.size(), base); } |