Skip to content

Commit 83b74ba

Browse files
sjaeckelsjaeckel
authored
Merge pull request #446 from libtom/suffix-renamings2
Alternative 2: Suffix renamings (_n suffix)
2 parents 86648a0 + 41eca34 commit 83b74ba

22 files changed

+177
-187
lines changed

‎demo/test.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ static int test_mp_sqrt(void)
729729
printf("\nmp_sqrt() error!");
730730
goto LBL_ERR;
731731
}
732-
DO(mp_root_u32(&a, 2u, &c));
732+
DO(mp_root_n(&a, 2u, &c));
733733
if (mp_cmp_mag(&b, &c) != MP_EQ) {
734734
printf("mp_sqrt() bad result!\n");
735735
goto LBL_ERR;
@@ -1396,10 +1396,10 @@ static int test_mp_reduce_2k_l(void)
13961396
/* stripped down version of mp_radix_size. The faster version can be off by up t
13971397
o +3 */
13981398
/* TODO: This function should be removed, replaced by mp_radix_size, mp_radix_size_overestimate in 2.0 */
1399-
static mp_err s_rs(const mp_int *a, int radix, uint32_t *size)
1399+
static mp_err s_rs(const mp_int *a, int radix, int *size)
14001400
{
14011401
mp_err res;
1402-
uint32_t digs = 0u;
1402+
int digs = 0u;
14031403
mp_int t;
14041404
mp_digit d;
14051405
*size = 0u;
@@ -1408,7 +1408,7 @@ static mp_err s_rs(const mp_int *a, int radix, uint32_t *size)
14081408
return MP_OKAY;
14091409
}
14101410
if (radix == 2) {
1411-
*size = (uint32_t)mp_count_bits(a) + 1u;
1411+
*size = mp_count_bits(a) + 1;
14121412
return MP_OKAY;
14131413
}
14141414
DOR(mp_init_copy(&t, a));
@@ -1424,12 +1424,12 @@ static mp_err s_rs(const mp_int *a, int radix, uint32_t *size)
14241424
*size = digs + 1;
14251425
return MP_OKAY;
14261426
}
1427-
static int test_mp_log_u32(void)
1427+
static int test_mp_log_n(void)
14281428
{
14291429
mp_int a;
14301430
mp_digit d;
1431-
uint32_t base, lb, size;
1432-
const uint32_t max_base = MP_MIN(UINT32_MAX, MP_DIGIT_MAX);
1431+
int base, lb, size;
1432+
const int max_base = MP_MIN(INT_MAX, MP_DIGIT_MAX);
14331433

14341434
DOR(mp_init(&a));
14351435

@@ -1440,11 +1440,11 @@ static int test_mp_log_u32(void)
14401440
*/
14411441
mp_set(&a, 42u);
14421442
base = 0u;
1443-
if (mp_log_u32(&a, base, &lb) != MP_VAL) {
1443+
if (mp_log_n(&a, base, &lb) != MP_VAL) {
14441444
goto LBL_ERR;
14451445
}
14461446
base = 1u;
1447-
if (mp_log_u32(&a, base, &lb) != MP_VAL) {
1447+
if (mp_log_n(&a, base, &lb) != MP_VAL) {
14481448
goto LBL_ERR;
14491449
}
14501450
/*
@@ -1456,14 +1456,14 @@ static int test_mp_log_u32(void)
14561456
*/
14571457
base = 2u;
14581458
mp_zero(&a);
1459-
if (mp_log_u32(&a, base, &lb) != MP_VAL) {
1459+
if (mp_log_n(&a, base, &lb) != MP_VAL) {
14601460
goto LBL_ERR;
14611461
}
14621462

14631463
for (d = 1; d < 4; d++) {
14641464
mp_set(&a, d);
1465-
DO(mp_log_u32(&a, base, &lb));
1466-
if (lb != ((d == 1)?0uL:1uL)) {
1465+
DO(mp_log_n(&a, base, &lb));
1466+
if (lb != ((d == 1)?0:1)) {
14671467
goto LBL_ERR;
14681468
}
14691469
}
@@ -1476,13 +1476,13 @@ static int test_mp_log_u32(void)
14761476
*/
14771477
base = 3u;
14781478
mp_zero(&a);
1479-
if (mp_log_u32(&a, base, &lb) != MP_VAL) {
1479+
if (mp_log_n(&a, base, &lb) != MP_VAL) {
14801480
goto LBL_ERR;
14811481
}
14821482
for (d = 1; d < 4; d++) {
14831483
mp_set(&a, d);
1484-
DO(mp_log_u32(&a, base, &lb));
1485-
if (lb != ((d < base)?0uL:1uL)) {
1484+
DO(mp_log_n(&a, base, &lb));
1485+
if (lb != (((int)d < base)?0:1)) {
14861486
goto LBL_ERR;
14871487
}
14881488
}
@@ -1493,8 +1493,8 @@ static int test_mp_log_u32(void)
14931493
radix_size.
14941494
*/
14951495
DO(mp_rand(&a, 10));
1496-
for (base = 2u; base < 65u; base++) {
1497-
DO(mp_log_u32(&a, base, &lb));
1496+
for (base = 2; base < 65; base++) {
1497+
DO(mp_log_n(&a, base, &lb));
14981498
DO(s_rs(&a,(int)base, &size));
14991499
/* radix_size includes the memory needed for '\0', too*/
15001500
size -= 2;
@@ -1508,8 +1508,8 @@ static int test_mp_log_u32(void)
15081508
test the part of mp_ilogb that uses native types.
15091509
*/
15101510
DO(mp_rand(&a, 1));
1511-
for (base = 2u; base < 65u; base++) {
1512-
DO(mp_log_u32(&a, base, &lb));
1511+
for (base = 2; base < 65; base++) {
1512+
DO(mp_log_n(&a, base, &lb));
15131513
DO(s_rs(&a,(int)base, &size));
15141514
size -= 2;
15151515
if (lb != size) {
@@ -1519,9 +1519,9 @@ static int test_mp_log_u32(void)
15191519

15201520
/*Test upper edgecase with base UINT32_MAX and number (UINT32_MAX/2)*UINT32_MAX^10 */
15211521
mp_set(&a, max_base);
1522-
DO(mp_expt_u32(&a, 10u, &a));
1523-
DO(mp_add_d(&a, max_base / 2u, &a));
1524-
DO(mp_log_u32(&a, max_base, &lb));
1522+
DO(mp_expt_n(&a, 10uL, &a));
1523+
DO(mp_add_d(&a, max_base / 2, &a));
1524+
DO(mp_log_n(&a, max_base, &lb));
15251525
if (lb != 10u) {
15261526
goto LBL_ERR;
15271527
}
@@ -1636,7 +1636,7 @@ static int test_mp_decr(void)
16361636
}
16371637

16381638
/*
1639-
Cannot test mp_exp(_d) without mp_root and vice versa.
1639+
Cannot test mp_exp(_d) without mp_root_n and vice versa.
16401640
So one of the two has to be tested from scratch.
16411641
16421642
Numbers generated by
@@ -1658,7 +1658,7 @@ static int test_mp_decr(void)
16581658
low-mp branch.
16591659
*/
16601660

1661-
static int test_mp_root_u32(void)
1661+
static int test_mp_root_n(void)
16621662
{
16631663
mp_int a, c, r;
16641664
int i, j;
@@ -1850,10 +1850,10 @@ static int test_mp_root_u32(void)
18501850
for (i = 0; i < 10; i++) {
18511851
DO(mp_read_radix(&a, input[i], 64));
18521852
for (j = 3; j < 100; j++) {
1853-
DO(mp_root_u32(&a, (uint32_t)j, &c));
1853+
DO(mp_root_n(&a, j, &c));
18541854
DO(mp_read_radix(&r, root[i][j-3], 10));
18551855
if (mp_cmp(&r, &c) != MP_EQ) {
1856-
fprintf(stderr, "mp_root_u32 failed at input #%d, root #%d\n", i, j);
1856+
fprintf(stderr, "mp_root_n failed at input #%d, root #%d\n", i, j);
18571857
goto LBL_ERR;
18581858
}
18591859
}
@@ -2037,8 +2037,8 @@ static int test_mp_radix_size(void)
20372037
DOR(mp_init(&a));
20382038

20392039
/* number to result in a different size for every base: 67^(4 * 67) */
2040-
mp_set(&a, 67u);
2041-
DO(mp_expt_u32(&a, 268u, &a));
2040+
mp_set(&a, 67);
2041+
DO(mp_expt_n(&a, 268, &a));
20422042

20432043
for (radix = 2; radix < 65; radix++) {
20442044
DO(mp_radix_size(&a, radix, &size));
@@ -2304,13 +2304,13 @@ static int unit_tests(int argc, char **argv)
23042304
T1(mp_get_u32, MP_GET_I32),
23052305
T1(mp_get_u64, MP_GET_I64),
23062306
T1(mp_get_ul, MP_GET_L),
2307-
T1(mp_log_u32, MP_LOG_U32),
2307+
T1(mp_log_n, MP_LOG_N),
23082308
T1(mp_incr, MP_ADD_D),
23092309
T1(mp_invmod, MP_INVMOD),
23102310
T1(mp_is_square, MP_IS_SQUARE),
23112311
T1(mp_kronecker, MP_KRONECKER),
23122312
T1(mp_montgomery_reduce, MP_MONTGOMERY_REDUCE),
2313-
T1(mp_root_u32, MP_ROOT_U32),
2313+
T1(mp_root_n, MP_ROOT_N),
23142314
T1(mp_or, MP_OR),
23152315
T1(mp_prime_is_prime, MP_PRIME_IS_PRIME),
23162316
T1(mp_prime_next_prime, MP_PRIME_NEXT_PRIME),
@@ -2326,7 +2326,7 @@ static int unit_tests(int argc, char **argv)
23262326
T1(mp_set_double, MP_SET_DOUBLE),
23272327
#endif
23282328
T1(mp_signed_rsh, MP_SIGNED_RSH),
2329-
T1(mp_sqrt, MP_SQRT),
2329+
T2(mp_sqrt, MP_SQRT, mp_root_n),
23302330
T1(mp_sqrtmod_prime, MP_SQRTMOD_PRIME),
23312331
T1(mp_xor, MP_XOR),
23322332
T2(s_mp_div_recursive, S_MP_DIV_RECURSIVE, S_MP_DIV_SCHOOL),

‎doc/bn.tex

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,9 +1911,9 @@ \section{Combined Modular Reduction}
19111911

19121912
\chapter{Exponentiation}
19131913
\section{Single Digit Exponentiation}
1914-
\index{mp\_expt\_u32}
1914+
\index{mp\_expt\_n}
19151915
\begin{alltt}
1916-
mp_err mp_expt_u32 (const mp_int *a, uint32_t b, mp_int *c)
1916+
mp_err mp_expt_n(const mp_int *a, int b, int *c)
19171917
\end{alltt}
19181918
This function computes $c = a^b$.
19191919

@@ -1940,9 +1940,9 @@ \section{Modulus a Power of Two}
19401940
It calculates $c = a \mod 2^b$.
19411941

19421942
\section{Root Finding}
1943-
\index{mp\_root\_u32}
1943+
\index{mp\_root\_n}
19441944
\begin{alltt}
1945-
mp_err mp_root_u32(const mp_int *a, uint32_t b, mp_int *c)
1945+
mp_err mp_root_n(const mp_int *a, int b, mp_int *c)
19461946
\end{alltt}
19471947
This computes $c = a^{1/b}$ such that $c^b \le a$ and $(c+1)^b > a$. Will return a positive root
19481948
only for even roots and return a root with the sign of the input for odd roots. For example,
@@ -1964,9 +1964,9 @@ \section{Integer Logarithm}
19641964
A logarithm function for positive integer input \texttt{a, base} computing $\floor{\log_bx}$ such
19651965
that $(\log_b x)^b \le x$.
19661966

1967-
\index{mp\_log\_u32}
1967+
\index{mp\_log\_n}
19681968
\begin{alltt}
1969-
mp_err mp_log_u32(const mp_int *a, uint32_t base, uint32_t *c)
1969+
mp_err mp_log_n(const mp_int *a, int base, int *c)
19701970
\end{alltt}
19711971

19721972
\subsection{Example}
@@ -1981,7 +1981,7 @@ \subsection{Example}
19811981
int main(int argc, char **argv)
19821982
{
19831983
mp_int x, output;
1984-
uint32_t base;
1984+
int base;
19851985
mp_err e;
19861986
19871987
if (argc != 3) {
@@ -1994,12 +1994,8 @@ \subsection{Example}
19941994
exit(EXIT_FAILURE);
19951995
}
19961996
errno = 0;
1997-
#ifdef MP_64BIT
1998-
/* Check for overflow skipped */
1999-
base = (uint32_t)strtoull(argv[1], NULL, 10);
2000-
#else
2001-
base = (uint32_t)strtoul(argv[1], NULL, 10);
2002-
#endif
1997+
base = (int)strtoul(argv[1], NULL, 10);
1998+
20031999
if (errno == ERANGE) {
20042000
fprintf(stderr,"strtoul(l) failed: input out of range\textbackslash{}n");
20052001
exit(EXIT_FAILURE);
@@ -2009,8 +2005,8 @@ \subsection{Example}
20092005
mp_error_to_string(e));
20102006
exit(EXIT_FAILURE);
20112007
}
2012-
if ((e = mp_log_u32(&x, base, &output)) != MP_OKAY) {
2013-
fprintf(stderr,"mp_ilogb failed: \textbackslash{}"%s\textbackslash{}"\textbackslash{}n",
2008+
if ((e = mp_log_n(&x, base, &output)) != MP_OKAY) {
2009+
fprintf(stderr,"mp_log_n failed: \textbackslash{}"%s\textbackslash{}"\textbackslash{}n",
20142010
mp_error_to_string(e));
20152011
exit(EXIT_FAILURE);
20162012
}

‎libtommath_VS2008.vcproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
>
418418
</File>
419419
<File
420-
RelativePath="mp_expt_u32.c"
420+
RelativePath="mp_expt_n.c"
421421
>
422422
</File>
423423
<File
@@ -557,7 +557,7 @@
557557
>
558558
</File>
559559
<File
560-
RelativePath="mp_log_u32.c"
560+
RelativePath="mp_log_n.c"
561561
>
562562
</File>
563563
<File
@@ -697,7 +697,7 @@
697697
>
698698
</File>
699699
<File
700-
RelativePath="mp_root_u32.c"
700+
RelativePath="mp_root_n.c"
701701
>
702702
</File>
703703
<File
@@ -857,11 +857,11 @@
857857
>
858858
</File>
859859
<File
860-
RelativePath="s_mp_log_d.c"
860+
RelativePath="s_mp_log_2expt.c"
861861
>
862862
</File>
863863
<File
864-
RelativePath="s_mp_log_pow2.c"
864+
RelativePath="s_mp_log_d.c"
865865
>
866866
</File>
867867
<File

‎makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@ LCOV_ARGS=--directory .
2929
OBJECTS=mp_2expt.o mp_abs.o mp_add.o mp_add_d.o mp_addmod.o mp_and.o mp_clamp.o mp_clear.o mp_clear_multi.o \
3030
mp_cmp.o mp_cmp_d.o mp_cmp_mag.o mp_cnt_lsb.o mp_complement.o mp_copy.o mp_count_bits.o mp_cutoffs.o \
3131
mp_div.o mp_div_2.o mp_div_2d.o mp_div_d.o mp_dr_is_modulus.o mp_dr_reduce.o mp_dr_setup.o \
32-
mp_error_to_string.o mp_exch.o mp_expt_u32.o mp_exptmod.o mp_exteuclid.o mp_fread.o mp_from_sbin.o \
32+
mp_error_to_string.o mp_exch.o mp_expt_n.o mp_exptmod.o mp_exteuclid.o mp_fread.o mp_from_sbin.o \
3333
mp_from_ubin.o mp_fwrite.o mp_gcd.o mp_get_double.o mp_get_i32.o mp_get_i64.o mp_get_l.o mp_get_ll.o \
3434
mp_get_mag_u32.o mp_get_mag_u64.o mp_get_mag_ul.o mp_get_mag_ull.o mp_grow.o mp_init.o mp_init_copy.o \
3535
mp_init_i32.o mp_init_i64.o mp_init_l.o mp_init_ll.o mp_init_multi.o mp_init_set.o mp_init_size.o \
3636
mp_init_u32.o mp_init_u64.o mp_init_ul.o mp_init_ull.o mp_invmod.o mp_is_square.o mp_kronecker.o mp_lcm.o \
37-
mp_log_u32.o mp_lshd.o mp_mod.o mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o \
37+
mp_log_n.o mp_lshd.o mp_mod.o mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o \
3838
mp_montgomery_setup.o mp_mul.o mp_mul_2.o mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_or.o mp_pack.o \
3939
mp_pack_count.o mp_prime_fermat.o mp_prime_frobenius_underwood.o mp_prime_is_prime.o \
4040
mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o mp_prime_rand.o \
4141
mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_rand.o mp_read_radix.o mp_reduce.o mp_reduce_2k.o \
4242
mp_reduce_2k_l.o mp_reduce_2k_setup.o mp_reduce_2k_setup_l.o mp_reduce_is_2k.o mp_reduce_is_2k_l.o \
43-
mp_reduce_setup.o mp_root_u32.o mp_rshd.o mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o \
43+
mp_reduce_setup.o mp_root_n.o mp_rshd.o mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o \
4444
mp_set_l.o mp_set_ll.o mp_set_u32.o mp_set_u64.o mp_set_ul.o mp_set_ull.o mp_shrink.o mp_signed_rsh.o \
4545
mp_sqrmod.o mp_sqrt.o mp_sqrtmod_prime.o mp_sub.o mp_sub_d.o mp_submod.o mp_to_radix.o mp_to_sbin.o \
4646
mp_to_ubin.o mp_ubin_size.o mp_unpack.o mp_xor.o mp_zero.o s_mp_add.o s_mp_copy_digs.o s_mp_div_3.o \
4747
s_mp_div_recursive.o s_mp_div_school.o s_mp_div_small.o s_mp_exptmod.o s_mp_exptmod_fast.o s_mp_get_bit.o \
48-
s_mp_invmod.o s_mp_invmod_odd.o s_mp_log.o s_mp_log_d.o s_mp_log_pow2.o s_mp_montgomery_reduce_comba.o \
48+
s_mp_invmod.o s_mp_invmod_odd.o s_mp_log.o s_mp_log_2expt.o s_mp_log_d.o s_mp_montgomery_reduce_comba.o \
4949
s_mp_mul.o s_mp_mul_balance.o s_mp_mul_comba.o s_mp_mul_high.o s_mp_mul_high_comba.o s_mp_mul_karatsuba.o \
5050
s_mp_mul_toom.o s_mp_prime_is_divisible.o s_mp_prime_tab.o s_mp_radix_map.o s_mp_rand_jenkins.o \
5151
s_mp_rand_platform.o s_mp_sqr.o s_mp_sqr_comba.o s_mp_sqr_karatsuba.o s_mp_sqr_toom.o s_mp_sub.o \

‎makefile.mingw

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ LIBMAIN_D =libtommath.dll
3131
OBJECTS=mp_2expt.o mp_abs.o mp_add.o mp_add_d.o mp_addmod.o mp_and.o mp_clamp.o mp_clear.o mp_clear_multi.o \
3232
mp_cmp.o mp_cmp_d.o mp_cmp_mag.o mp_cnt_lsb.o mp_complement.o mp_copy.o mp_count_bits.o mp_cutoffs.o \
3333
mp_div.o mp_div_2.o mp_div_2d.o mp_div_d.o mp_dr_is_modulus.o mp_dr_reduce.o mp_dr_setup.o \
34-
mp_error_to_string.o mp_exch.o mp_expt_u32.o mp_exptmod.o mp_exteuclid.o mp_fread.o mp_from_sbin.o \
34+
mp_error_to_string.o mp_exch.o mp_expt_n.o mp_exptmod.o mp_exteuclid.o mp_fread.o mp_from_sbin.o \
3535
mp_from_ubin.o mp_fwrite.o mp_gcd.o mp_get_double.o mp_get_i32.o mp_get_i64.o mp_get_l.o mp_get_ll.o \
3636
mp_get_mag_u32.o mp_get_mag_u64.o mp_get_mag_ul.o mp_get_mag_ull.o mp_grow.o mp_init.o mp_init_copy.o \
3737
mp_init_i32.o mp_init_i64.o mp_init_l.o mp_init_ll.o mp_init_multi.o mp_init_set.o mp_init_size.o \
3838
mp_init_u32.o mp_init_u64.o mp_init_ul.o mp_init_ull.o mp_invmod.o mp_is_square.o mp_kronecker.o mp_lcm.o \
39-
mp_log_u32.o mp_lshd.o mp_mod.o mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o \
39+
mp_log_n.o mp_lshd.o mp_mod.o mp_mod_2d.o mp_montgomery_calc_normalization.o mp_montgomery_reduce.o \
4040
mp_montgomery_setup.o mp_mul.o mp_mul_2.o mp_mul_2d.o mp_mul_d.o mp_mulmod.o mp_neg.o mp_or.o mp_pack.o \
4141
mp_pack_count.o mp_prime_fermat.o mp_prime_frobenius_underwood.o mp_prime_is_prime.o \
4242
mp_prime_miller_rabin.o mp_prime_next_prime.o mp_prime_rabin_miller_trials.o mp_prime_rand.o \
4343
mp_prime_strong_lucas_selfridge.o mp_radix_size.o mp_rand.o mp_read_radix.o mp_reduce.o mp_reduce_2k.o \
4444
mp_reduce_2k_l.o mp_reduce_2k_setup.o mp_reduce_2k_setup_l.o mp_reduce_is_2k.o mp_reduce_is_2k_l.o \
45-
mp_reduce_setup.o mp_root_u32.o mp_rshd.o mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o \
45+
mp_reduce_setup.o mp_root_n.o mp_rshd.o mp_sbin_size.o mp_set.o mp_set_double.o mp_set_i32.o mp_set_i64.o \
4646
mp_set_l.o mp_set_ll.o mp_set_u32.o mp_set_u64.o mp_set_ul.o mp_set_ull.o mp_shrink.o mp_signed_rsh.o \
4747
mp_sqrmod.o mp_sqrt.o mp_sqrtmod_prime.o mp_sub.o mp_sub_d.o mp_submod.o mp_to_radix.o mp_to_sbin.o \
4848
mp_to_ubin.o mp_ubin_size.o mp_unpack.o mp_xor.o mp_zero.o s_mp_add.o s_mp_copy_digs.o s_mp_div_3.o \
4949
s_mp_div_recursive.o s_mp_div_school.o s_mp_div_small.o s_mp_exptmod.o s_mp_exptmod_fast.o s_mp_get_bit.o \
50-
s_mp_invmod.o s_mp_invmod_odd.o s_mp_log.o s_mp_log_d.o s_mp_log_pow2.o s_mp_montgomery_reduce_comba.o \
50+
s_mp_invmod.o s_mp_invmod_odd.o s_mp_log.o s_mp_log_2expt.o s_mp_log_d.o s_mp_montgomery_reduce_comba.o \
5151
s_mp_mul.o s_mp_mul_balance.o s_mp_mul_comba.o s_mp_mul_high.o s_mp_mul_high_comba.o s_mp_mul_karatsuba.o \
5252
s_mp_mul_toom.o s_mp_prime_is_divisible.o s_mp_prime_tab.o s_mp_radix_map.o s_mp_rand_jenkins.o \
5353
s_mp_rand_platform.o s_mp_sqr.o s_mp_sqr_comba.o s_mp_sqr_karatsuba.o s_mp_sqr_toom.o s_mp_sub.o \

‎makefile.msvc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ LIBMAIN_S =tommath.lib
2424
OBJECTS=mp_2expt.obj mp_abs.obj mp_add.obj mp_add_d.obj mp_addmod.obj mp_and.obj mp_clamp.obj mp_clear.obj mp_clear_multi.obj \
2525
mp_cmp.obj mp_cmp_d.obj mp_cmp_mag.obj mp_cnt_lsb.obj mp_complement.obj mp_copy.obj mp_count_bits.obj mp_cutoffs.obj \
2626
mp_div.obj mp_div_2.obj mp_div_2d.obj mp_div_d.obj mp_dr_is_modulus.obj mp_dr_reduce.obj mp_dr_setup.obj \
27-
mp_error_to_string.obj mp_exch.obj mp_expt_u32.obj mp_exptmod.obj mp_exteuclid.obj mp_fread.obj mp_from_sbin.obj \
27+
mp_error_to_string.obj mp_exch.obj mp_expt_n.obj mp_exptmod.obj mp_exteuclid.obj mp_fread.obj mp_from_sbin.obj \
2828
mp_from_ubin.obj mp_fwrite.obj mp_gcd.obj mp_get_double.obj mp_get_i32.obj mp_get_i64.obj mp_get_l.obj mp_get_ll.obj \
2929
mp_get_mag_u32.obj mp_get_mag_u64.obj mp_get_mag_ul.obj mp_get_mag_ull.obj mp_grow.obj mp_init.obj mp_init_copy.obj \
3030
mp_init_i32.obj mp_init_i64.obj mp_init_l.obj mp_init_ll.obj mp_init_multi.obj mp_init_set.obj mp_init_size.obj \
3131
mp_init_u32.obj mp_init_u64.obj mp_init_ul.obj mp_init_ull.obj mp_invmod.obj mp_is_square.obj mp_kronecker.obj mp_lcm.obj \
32-
mp_log_u32.obj mp_lshd.obj mp_mod.obj mp_mod_2d.obj mp_montgomery_calc_normalization.obj mp_montgomery_reduce.obj \
32+
mp_log_n.obj mp_lshd.obj mp_mod.obj mp_mod_2d.obj mp_montgomery_calc_normalization.obj mp_montgomery_reduce.obj \
3333
mp_montgomery_setup.obj mp_mul.obj mp_mul_2.obj mp_mul_2d.obj mp_mul_d.obj mp_mulmod.obj mp_neg.obj mp_or.obj mp_pack.obj \
3434
mp_pack_count.obj mp_prime_fermat.obj mp_prime_frobenius_underwood.obj mp_prime_is_prime.obj \
3535
mp_prime_miller_rabin.obj mp_prime_next_prime.obj mp_prime_rabin_miller_trials.obj mp_prime_rand.obj \
3636
mp_prime_strong_lucas_selfridge.obj mp_radix_size.obj mp_rand.obj mp_read_radix.obj mp_reduce.obj mp_reduce_2k.obj \
3737
mp_reduce_2k_l.obj mp_reduce_2k_setup.obj mp_reduce_2k_setup_l.obj mp_reduce_is_2k.obj mp_reduce_is_2k_l.obj \
38-
mp_reduce_setup.obj mp_root_u32.obj mp_rshd.obj mp_sbin_size.obj mp_set.obj mp_set_double.obj mp_set_i32.obj mp_set_i64.obj \
38+
mp_reduce_setup.obj mp_root_n.obj mp_rshd.obj mp_sbin_size.obj mp_set.obj mp_set_double.obj mp_set_i32.obj mp_set_i64.obj \
3939
mp_set_l.obj mp_set_ll.obj mp_set_u32.obj mp_set_u64.obj mp_set_ul.obj mp_set_ull.obj mp_shrink.obj mp_signed_rsh.obj \
4040
mp_sqrmod.obj mp_sqrt.obj mp_sqrtmod_prime.obj mp_sub.obj mp_sub_d.obj mp_submod.obj mp_to_radix.obj mp_to_sbin.obj \
4141
mp_to_ubin.obj mp_ubin_size.obj mp_unpack.obj mp_xor.obj mp_zero.obj s_mp_add.obj s_mp_copy_digs.obj s_mp_div_3.obj \
4242
s_mp_div_recursive.obj s_mp_div_school.obj s_mp_div_small.obj s_mp_exptmod.obj s_mp_exptmod_fast.obj s_mp_get_bit.obj \
43-
s_mp_invmod.obj s_mp_invmod_odd.obj s_mp_log.obj s_mp_log_d.obj s_mp_log_pow2.obj s_mp_montgomery_reduce_comba.obj \
43+
s_mp_invmod.obj s_mp_invmod_odd.obj s_mp_log.obj s_mp_log_2expt.obj s_mp_log_d.obj s_mp_montgomery_reduce_comba.obj \
4444
s_mp_mul.obj s_mp_mul_balance.obj s_mp_mul_comba.obj s_mp_mul_high.obj s_mp_mul_high_comba.obj s_mp_mul_karatsuba.obj \
4545
s_mp_mul_toom.obj s_mp_prime_is_divisible.obj s_mp_prime_tab.obj s_mp_radix_map.obj s_mp_rand_jenkins.obj \
4646
s_mp_rand_platform.obj s_mp_sqr.obj s_mp_sqr_comba.obj s_mp_sqr_karatsuba.obj s_mp_sqr_toom.obj s_mp_sub.obj \

0 commit comments

Comments
 (0)