Commit 5c5d600a8283f7f62a996fbd0c10c9faf360deba
2014-10-14T14:33:36
demo: calm compiler warnings & improve a bit
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322
diff --git a/demo/demo.c b/demo/demo.c
index 78e0903..48352f6 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -70,6 +70,14 @@ int myrng(unsigned char *dst, int len, void *dat)
return len;
}
+#if LTM_DEMO_TEST_VS_MTEST != 0
+static void _panic(int l)
+{
+ fprintf(stderr, "\n%d: fgets failed\n", l);
+ exit(EXIT_FAILURE);
+}
+#endif
+
mp_int a, b, c, d, e, f;
static void _cleanup(void)
@@ -80,23 +88,25 @@ static void _cleanup(void)
char cmd[4096], buf[4096];
int main(void)
{
- unsigned long t;
unsigned rr;
- int i, n, err, cnt, ix;
- mp_digit mp;
+ int cnt, ix;
#if LTM_DEMO_TEST_VS_MTEST
unsigned long expt_n, add_n, sub_n, mul_n, div_n, sqr_n, mul2d_n, div2d_n,
gcd_n, lcm_n, inv_n, div2_n, mul2_n, add_d_n, sub_d_n;
- int old_kara_m, old_kara_s;
+ char* ret;
+#else
+ unsigned long t;
+ mp_digit mp;
+ int i, n, err;
#endif
- mp_init_multi(&a, &b, &c, &d, &e, &f, NULL);
+ if (mp_init_multi(&a, &b, &c, &d, &e, &f, NULL)!= MP_OKAY)
+ return EXIT_FAILURE;
atexit(_cleanup);
srand(LTM_DEMO_RAND_SEED);
-#if LTM_DEMO_TEST_VS_MTEST == 0
#ifdef MP_8BIT
printf("Digit size 8 Bit \n");
#endif
@@ -109,11 +119,12 @@ int main(void)
#ifdef MP_64BIT
printf("Digit size 64 Bit \n");
#endif
- printf("Size of mp_digit: %u\n", sizeof(mp_digit));
- printf("Size of mp_word: %u\n", sizeof(mp_word));
+ printf("Size of mp_digit: %u\n", (unsigned int)sizeof(mp_digit));
+ printf("Size of mp_word: %u\n", (unsigned int)sizeof(mp_word));
printf("DIGIT_BIT: %d\n", DIGIT_BIT);
printf("MP_PREC: %d\n", MP_PREC);
+#if LTM_DEMO_TEST_VS_MTEST == 0
// test montgomery
printf("Testing: montgomery...\n");
for (i = 1; i < 10; i++) {
@@ -419,7 +430,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
mp_copy(&b, &c);
printf("Testing: mp_reduce_2k_l...");
fflush(stdout);
- for (cnt = 0; cnt < (1UL << 20); cnt++) {
+ for (cnt = 0; cnt < (int)(1UL << 20); cnt++) {
mp_sqr(&b, &b);
mp_add_d(&b, 1, &b);
mp_reduce_2k_l(&b, &a, &d);
@@ -427,7 +438,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
mp_add_d(&c, 1, &c);
mp_mod(&c, &a, &c);
if (mp_cmp(&b, &c) != MP_EQ) {
- printf("mp_reduce_2k_l() failed at step %lu\n", cnt);
+ printf("mp_reduce_2k_l() failed at step %d\n", cnt);
mp_tohex(&b, buf);
printf("b == %s\n", buf);
mp_tohex(&c, buf);
@@ -484,17 +495,17 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
("%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu/%4lu ",
add_n, sub_n, mul_n, div_n, sqr_n, mul2d_n, div2d_n, gcd_n, lcm_n,
expt_n, inv_n, div2_n, mul2_n, add_d_n, sub_d_n);
- fgets(cmd, 4095, stdin);
+ ret=fgets(cmd, 4095, stdin); if(!ret){_panic(__LINE__);}
cmd[strlen(cmd) - 1] = 0;
- printf("%s ]\r", cmd);
+ printf("%-6s ]\r", cmd);
fflush(stdout);
if (!strcmp(cmd, "mul2d")) {
++mul2d_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
sscanf(buf, "%d", &rr);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_mul_2d(&a, rr, &a);
@@ -507,11 +518,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "div2d")) {
++div2d_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
sscanf(buf, "%d", &rr);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_div_2d(&a, rr, &a, &e);
@@ -527,11 +538,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "add")) {
++add_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
mp_copy(&a, &d);
mp_add(&d, &b, &d);
@@ -571,11 +582,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
} else if (!strcmp(cmd, "sub")) {
++sub_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
mp_copy(&a, &d);
mp_sub(&d, &b, &d);
@@ -589,11 +600,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "mul")) {
++mul_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
mp_copy(&a, &d);
mp_mul(&d, &b, &d);
@@ -607,13 +618,13 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "div")) {
++div_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&d, buf, 64);
mp_div(&a, &b, &e, &f);
@@ -631,9 +642,9 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
} else if (!strcmp(cmd, "sqr")) {
++sqr_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_copy(&a, &c);
mp_sqr(&c, &c);
@@ -646,11 +657,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "gcd")) {
++gcd_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
mp_copy(&a, &d);
mp_gcd(&d, &b, &d);
@@ -665,11 +676,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "lcm")) {
++lcm_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
mp_copy(&a, &d);
mp_lcm(&d, &b, &d);
@@ -684,13 +695,13 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "expt")) {
++expt_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&d, buf, 64);
mp_copy(&a, &e);
mp_exptmod(&e, &b, &c, &e);
@@ -705,11 +716,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "invmod")) {
++inv_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&c, buf, 64);
mp_invmod(&a, &b, &d);
mp_mulmod(&d, &a, &b, &e);
@@ -719,6 +730,7 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
draw(&b);
draw(&c);
draw(&d);
+ draw(&e);
mp_gcd(&a, &b, &e);
draw(&e);
return EXIT_FAILURE;
@@ -726,9 +738,9 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
} else if (!strcmp(cmd, "div2")) {
++div2_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_div_2(&a, &c);
if (mp_cmp(&c, &b) != MP_EQ) {
@@ -740,9 +752,9 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "mul2")) {
++mul2_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_mul_2(&a, &c);
if (mp_cmp(&c, &b) != MP_EQ) {
@@ -754,11 +766,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "add_d")) {
++add_d_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
sscanf(buf, "%d", &ix);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_add_d(&a, ix, &c);
if (mp_cmp(&b, &c) != MP_EQ) {
@@ -771,11 +783,11 @@ printf("compare no compare!\n"); return EXIT_FAILURE; }
}
} else if (!strcmp(cmd, "sub_d")) {
++sub_d_n;
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&a, buf, 64);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
sscanf(buf, "%d", &ix);
- fgets(buf, 4095, stdin);
+ ret=fgets(buf, 4095, stdin); if(!ret){_panic(__LINE__);}
mp_read_radix(&b, buf, 64);
mp_sub_d(&a, ix, &c);
if (mp_cmp(&b, &c) != MP_EQ) {