From dc150614d9b2cbc6753500a2ec5ff5b346ea0e2d Mon Sep 17 00:00:00 2001 From: czurnieden Date: Fri, 7 Dec 2018 20:24:41 +0100 Subject: [PATCH 1/3] renamed variables in demo/demo.c shadowning another one --- demo/demo.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/demo/demo.c b/demo/demo.c index 7ab66ee..368f062 100644 --- a/demo/demo.c +++ b/demo/demo.c @@ -284,20 +284,20 @@ int main(void) /* test mp_tc_div_2d */ printf("\n\nTesting: mp_tc_div_2d"); for (i = 0; i < 1000; ++i) { - int l, m; + int l, em; l = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); mp_set_int(&a, labs(l)); if (l < 0) mp_neg(&a, &a); - m = rand() % 32; + em = rand() % 32; - mp_set_int(&d, labs(l >> m)); - if ((l >> m) < 0) + mp_set_int(&d, labs(l >> em)); + if ((l >> em) < 0) mp_neg(&d, &d); - mp_tc_div_2d(&a, m, &b); + mp_tc_div_2d(&a, em, &b); if (mp_cmp(&b, &d) != MP_EQ) { printf("\nmp_tc_div_2d() bad result!"); return EXIT_FAILURE; @@ -305,22 +305,22 @@ int main(void) } /* test mp_tc_xor */ - printf("\n\nTesting: mp_tc_or"); + printf("\n\nTesting: mp_tc_xor"); for (i = 0; i < 1000; ++i) { - int l, m; + int l, em; l = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); mp_set_int(&a, labs(l)); if (l < 0) mp_neg(&a, &a); - m = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); - mp_set_int(&b, labs(m)); - if (m < 0) + em = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); + mp_set_int(&b, labs(em)); + if (em < 0) mp_neg(&b, &b); - mp_set_int(&d, labs(l ^ m)); - if ((l ^ m) < 0) + mp_set_int(&d, labs(l ^ em)); + if ((l ^ em) < 0) mp_neg(&d, &d); mp_tc_xor(&a, &b, &c); @@ -333,20 +333,20 @@ int main(void) /* test mp_tc_or */ printf("\n\nTesting: mp_tc_or"); for (i = 0; i < 1000; ++i) { - int l, m; + int l, em; l = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); mp_set_int(&a, labs(l)); if (l < 0) mp_neg(&a, &a); - m = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); - mp_set_int(&b, labs(m)); - if (m < 0) + em = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); + mp_set_int(&b, labs(em)); + if (em < 0) mp_neg(&b, &b); - mp_set_int(&d, labs(l | m)); - if ((l | m) < 0) + mp_set_int(&d, labs(l | em)); + if ((l | em) < 0) mp_neg(&d, &d); mp_tc_or(&a, &b, &c); @@ -359,20 +359,20 @@ int main(void) /* test mp_tc_and */ printf("\n\nTesting: mp_tc_and"); for (i = 0; i < 1000; ++i) { - int l, m; + int l, em; l = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); mp_set_int(&a, labs(l)); if (l < 0) mp_neg(&a, &a); - m = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); - mp_set_int(&b, labs(m)); - if (m < 0) + em = (rand() * rand() + 1) * (rand() % 1 ? -1 : 1); + mp_set_int(&b, labs(em)); + if (em < 0) mp_neg(&b, &b); - mp_set_int(&d, labs(l & m)); - if ((l & m) < 0) + mp_set_int(&d, labs(l & em)); + if ((l & em) < 0) mp_neg(&d, &d); mp_tc_and(&a, &b, &c); From 44e4986bfedbe36d24a8d2ca658f0cc64e237e0c Mon Sep 17 00:00:00 2001 From: czurnieden Date: Fri, 7 Dec 2018 20:47:51 +0100 Subject: [PATCH 2/3] made preprocessor warning in bn_mp_set_double.c portable --- bn_mp_set_double.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bn_mp_set_double.c b/bn_mp_set_double.c index 6d84874..8a148e9 100644 --- a/bn_mp_set_double.c +++ b/bn_mp_set_double.c @@ -49,7 +49,11 @@ int mp_set_double(mp_int *a, double b) return MP_OKAY; } #else -# warning "mp_set_double implementation is only available on platforms with IEEE754 floating point format" +# ifdef _MSC_VER +# pragma message("mp_set_double implementation is only available on platforms with IEEE754 floating point format") +# else +# warning "mp_set_double implementation is only available on platforms with IEEE754 floating point format" +# endif #endif #endif From 7ce3d1599573e0cbedb7655b8419cbd8d670a7cc Mon Sep 17 00:00:00 2001 From: czurnieden Date: Fri, 7 Dec 2018 21:18:43 +0100 Subject: [PATCH 3/3] commented additional preprocessor branch in bn_mp_set_double.c --- bn_mp_set_double.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bn_mp_set_double.c b/bn_mp_set_double.c index 8a148e9..c78cb22 100644 --- a/bn_mp_set_double.c +++ b/bn_mp_set_double.c @@ -49,6 +49,7 @@ int mp_set_double(mp_int *a, double b) return MP_OKAY; } #else +/* pragma message() not supported by several compilers (in mostly older but still used versions) */ # ifdef _MSC_VER # pragma message("mp_set_double implementation is only available on platforms with IEEE754 floating point format") # else