aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/math
diff options
context:
space:
mode:
authorSimon Warta <simon@warta.it>2015-07-15 00:13:13 +0200
committerSimon Warta <simon@warta.it>2015-07-15 13:51:20 +0200
commit7f3c4b1ab3837e75e890232bd2c3ecb9f6390732 (patch)
tree485ca6e7e6739693a3dd1cb32b812096cb633b75 /src/lib/math
parentbac65bbdd0f28804f0418d41bd63fa39c290c68d (diff)
Fix round_up
1. src/lib/codec/base64/base64.cpp: : (round_up<size_t>(input_length, 3) / 3) * 4; 2. src/lib/codec/base64/base64.cpp: : (round_up<size_t>(input_length, 4) * 3) / 4; 3. src/lib/filters/transform_filter.cpp: return round_up(target_size, update_granularity); 4. src/lib/math/bigint/bigint.cpp: m_reg.resize(round_up<size_t>(size, 8)); 5. src/lib/math/bigint/bigint.cpp: m_reg.resize(round_up<size_t>((length / WORD_BYTES) + 1, 8)); 6. src/lib/math/numbertheory/mp_numth.cpp: BigInt z(BigInt::Positive, round_up<size_t>(2*x_sw, 16)); 7. src/lib/modes/cbc/cbc.cpp: return round_up(input_length, cipher().block_size()); 8. src/lib/modes/ecb/ecb.cpp: return round_up(input_length, cipher().block_size()); 9. src/lib/modes/xts/xts.cpp: return round_up(input_length, cipher().block_size()); 10. src/lib/pbkdf/pbkdf2/pbkdf2.cpp: const size_t blocks_needed = round_up(out_len, prf_sz) / prf_sz; 11. src/lib/tls/tls_record.cpp: const size_t buf_size = round_up( 12. src/lib/utils/rounding.h:inline T round_up(T n, T align_to) 1. Reason for change 2. Reason for change 3. first argument cannot be 0 (`target_size = 1024`) 4. Is a bug in the current implementation iff `size = 0` 5. first argument cannot be 0 6. round_up should return 0 if `x_sw = 0` 7. ? 8. ? 9. ? 10. first argument cannot be 0 (`if(out_len == 0) return 0;`) 11. first argument is unlikely to be 0 (`iv_size + msg_length + mac_size + (block_size ? 1 : 0)`) 12. Implementation
Diffstat (limited to 'src/lib/math')
-rw-r--r--src/lib/math/bigint/bigint.cpp4
-rw-r--r--src/lib/math/numbertheory/mp_numth.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/math/bigint/bigint.cpp b/src/lib/math/bigint/bigint.cpp
index b5a8e0dd5..c9aa1d981 100644
--- a/src/lib/math/bigint/bigint.cpp
+++ b/src/lib/math/bigint/bigint.cpp
@@ -34,7 +34,7 @@ BigInt::BigInt(u64bit n)
*/
BigInt::BigInt(Sign s, size_t size)
{
- m_reg.resize(round_up<size_t>(size, 8));
+ m_reg.resize(round_up(size, 8));
m_signedness = s;
}
@@ -271,7 +271,7 @@ void BigInt::binary_decode(const byte buf[], size_t length)
const size_t WORD_BYTES = sizeof(word);
clear();
- m_reg.resize(round_up<size_t>((length / WORD_BYTES) + 1, 8));
+ m_reg.resize(round_up((length / WORD_BYTES) + 1, 8));
for(size_t i = 0; i != length / WORD_BYTES; ++i)
{
diff --git a/src/lib/math/numbertheory/mp_numth.cpp b/src/lib/math/numbertheory/mp_numth.cpp
index fafc6b03f..6eb938286 100644
--- a/src/lib/math/numbertheory/mp_numth.cpp
+++ b/src/lib/math/numbertheory/mp_numth.cpp
@@ -19,7 +19,7 @@ BigInt square(const BigInt& x)
{
const size_t x_sw = x.sig_words();
- BigInt z(BigInt::Positive, round_up<size_t>(2*x_sw, 16));
+ BigInt z(BigInt::Positive, round_up(2*x_sw, 16));
secure_vector<word> workspace(z.size());
bigint_sqr(z.mutable_data(), z.size(),