1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 15:38:11 +00:00

bignum: rename bn_load_uint* to bn_read_uint*

This commit is contained in:
Alex Beregszaszi 2016-08-26 12:14:01 +01:00
parent 4eb2bd239c
commit 29e82018cd
3 changed files with 15 additions and 15 deletions

View File

@ -156,7 +156,7 @@ void bn_write_le(const bignum256 *in_number, uint8_t *out_number)
} }
} }
void bn_load_uint32(uint32_t in_number, bignum256 *out_number) void bn_read_uint32(uint32_t in_number, bignum256 *out_number)
{ {
out_number->val[0] = in_number & 0x3FFFFFFF; out_number->val[0] = in_number & 0x3FFFFFFF;
out_number->val[1] = in_number >> 30; out_number->val[1] = in_number >> 30;
@ -169,7 +169,7 @@ void bn_load_uint32(uint32_t in_number, bignum256 *out_number)
out_number->val[8] = 0; out_number->val[8] = 0;
} }
void bn_load_uint64(uint64_t in_number, bignum256 *out_number) void bn_read_uint64(uint64_t in_number, bignum256 *out_number)
{ {
out_number->val[0] = in_number & 0x3FFFFFFF; out_number->val[0] = in_number & 0x3FFFFFFF;
out_number->val[1] = (in_number >>= 30) & 0x3FFFFFFF; out_number->val[1] = (in_number >>= 30) & 0x3FFFFFFF;

View File

@ -54,9 +54,9 @@ void bn_read_le(const uint8_t *in_number, bignum256 *out_number);
void bn_write_le(const bignum256 *in_number, uint8_t *out_number); void bn_write_le(const bignum256 *in_number, uint8_t *out_number);
void bn_load_uint32(uint32_t in_number, bignum256 *out_number); void bn_read_uint32(uint32_t in_number, bignum256 *out_number);
void bn_load_uint64(uint64_t in_number, bignum256 *out_number); void bn_read_uint64(uint64_t in_number, bignum256 *out_number);
// copies number a to b // copies number a to b
static inline void bn_copy(const bignum256 *a, bignum256 *b) { static inline void bn_copy(const bignum256 *a, bignum256 *b) {

22
tests.c
View File

@ -183,52 +183,52 @@ START_TEST(test_bignum_write_le)
} }
END_TEST END_TEST
START_TEST(test_bignum_load_uint32) START_TEST(test_bignum_read_uint32)
{ {
bignum256 a; bignum256 a;
bignum256 b; bignum256 b;
// lowest 30 bits set // lowest 30 bits set
bn_read_be(fromhex("000000000000000000000000000000000000000000000000000000003fffffff"), &a); bn_read_be(fromhex("000000000000000000000000000000000000000000000000000000003fffffff"), &a);
bn_load_uint32(0x3fffffff, &b); bn_read_uint32(0x3fffffff, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
// bit 31 set // bit 31 set
bn_read_be(fromhex("0000000000000000000000000000000000000000000000000000000040000000"), &a); bn_read_be(fromhex("0000000000000000000000000000000000000000000000000000000040000000"), &a);
bn_load_uint32(0x40000000, &b); bn_read_uint32(0x40000000, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
} }
END_TEST END_TEST
START_TEST(test_bignum_load_uint64) START_TEST(test_bignum_read_uint64)
{ {
bignum256 a; bignum256 a;
bignum256 b; bignum256 b;
// lowest 30 bits set // lowest 30 bits set
bn_read_be(fromhex("000000000000000000000000000000000000000000000000000000003fffffff"), &a); bn_read_be(fromhex("000000000000000000000000000000000000000000000000000000003fffffff"), &a);
bn_load_uint64(0x3fffffff, &b); bn_read_uint64(0x3fffffff, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
// bit 31 set // bit 31 set
bn_read_be(fromhex("0000000000000000000000000000000000000000000000000000000040000000"), &a); bn_read_be(fromhex("0000000000000000000000000000000000000000000000000000000040000000"), &a);
bn_load_uint64(0x40000000, &b); bn_read_uint64(0x40000000, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
// bit 33 set // bit 33 set
bn_read_be(fromhex("0000000000000000000000000000000000000000000000000000000100000000"), &a); bn_read_be(fromhex("0000000000000000000000000000000000000000000000000000000100000000"), &a);
bn_load_uint64(0x100000000LL, &b); bn_read_uint64(0x100000000LL, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
// bit 61 set // bit 61 set
bn_read_be(fromhex("0000000000000000000000000000000000000000000000002000000000000000"), &a); bn_read_be(fromhex("0000000000000000000000000000000000000000000000002000000000000000"), &a);
bn_load_uint64(0x2000000000000000LL, &b); bn_read_uint64(0x2000000000000000LL, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
// all 64 bits set // all 64 bits set
bn_read_be(fromhex("000000000000000000000000000000000000000000000000ffffffffffffffff"), &a); bn_read_be(fromhex("000000000000000000000000000000000000000000000000ffffffffffffffff"), &a);
bn_load_uint64(0xffffffffffffffffLL, &b); bn_read_uint64(0xffffffffffffffffLL, &b);
ck_assert_int_eq(bn_is_equal(&a, &b), 1); ck_assert_int_eq(bn_is_equal(&a, &b), 1);
} }
END_TEST END_TEST
@ -2527,8 +2527,8 @@ Suite *test_suite(void)
tcase_add_test(tc, test_bignum_is_zero); tcase_add_test(tc, test_bignum_is_zero);
tcase_add_test(tc, test_bignum_read_le); tcase_add_test(tc, test_bignum_read_le);
tcase_add_test(tc, test_bignum_write_le); tcase_add_test(tc, test_bignum_write_le);
tcase_add_test(tc, test_bignum_load_uint32); tcase_add_test(tc, test_bignum_read_uint32);
tcase_add_test(tc, test_bignum_load_uint64); tcase_add_test(tc, test_bignum_read_uint64);
tcase_add_test(tc, test_bignum_copy); tcase_add_test(tc, test_bignum_copy);
tcase_add_test(tc, test_bignum_is_even); tcase_add_test(tc, test_bignum_is_even);
tcase_add_test(tc, test_bignum_is_odd); tcase_add_test(tc, test_bignum_is_odd);