Adapting tests to C99

Author: czurnieden

demo/test.c

@@ -840,14 +840,15 @@ static const uint32_t SPSP_3[] = {
 };
 
 /* SPSP to all bases < 100 */
+/* still needs computing
 static const char *SPSP_2_100_LARGE[] = {
    "",
    "",
    "",
    "",
    ""
 };
-
+*/
 
 /* Extra strong Lucas test with Baillie's parameters Q = 1, P = 3 */
 static const uint32_t ESLPSP[] =  {
@@ -887,26 +888,27 @@ static int test_mp_prime_miller_rabin(void)
 {
    mp_int a, b, c;
    bool result;
+   int i;
    DOR(mp_init_multi(&a, &b, &c, NULL));
 
    /* SPSP to base 2 */
    mp_set(&b, 2u);
-   for (int i = 0; i < ARR_LENGTH(SPSP_2); i++) {
+   for (i = 0; i < ARR_LENGTH(SPSP_2); i++) {
       result = false;
       mp_set_u32(&a, SPSP_2[i]);
       DO(mp_prime_miller_rabin(&a, &b, &result));
       EXPECT(result == true);
    }
 
    /* Some larger primes to check for false negatives */
-   for (int i = 0; i < 10; i++) {
+   for (i = 0; i < 10; i++) {
       result = false;
       DO(mp_read_radix(&a, medium_primes[i], 64));
       DO(mp_prime_miller_rabin(&a, &b, &result));
       EXPECT(result == true);
    }
    /* Some semi-primes */
-   for (int i = 0; i < 5; i += 2) {
+   for (i = 0; i < 5; i += 2) {
       result = false;
       DO(mp_read_radix(&a, medium_primes[i], 64));
       DO(mp_read_radix(&c, medium_primes[i+1], 64));
@@ -917,7 +919,7 @@ static int test_mp_prime_miller_rabin(void)
 
    /* SPSP to base 3 */
    mp_set(&b, 3u);
-   for (int i = 0; i < ARR_LENGTH(SPSP_3); i++) {
+   for (i = 0; i < ARR_LENGTH(SPSP_3); i++) {
       result = false;
       mp_set_u32(&a, SPSP_3[i]);
       DO(mp_prime_miller_rabin(&a, &b, &result));
@@ -936,34 +938,36 @@ static int test_mp_prime_extra_strong_lucas(void)
 {
    mp_int a, b;
    bool result;
+   int i;
+
    DOR(mp_init_multi(&a, &b, NULL));
 
    /* Check Extra Strong pseudoprimes */
-   for (int i = 0; i < ARR_LENGTH(ESLPSP); i++) {
+   for (i = 0; i < ARR_LENGTH(ESLPSP); i++) {
       result = false;
       mp_set_u32(&a, ESLPSP[i]);
       DO(mp_prime_extra_strong_lucas(&a, &result));
       EXPECT(result == true);
    }
 
    /* Check Almost Extra Strong pseudoprimes (not in ESLPSP) */
-   for (int i = 0; i < ARR_LENGTH(AESLPSP); i++) {
+   for (i = 0; i < ARR_LENGTH(AESLPSP); i++) {
       result = false;
       mp_set_u32(&a, AESLPSP[i]);
       DO(mp_prime_extra_strong_lucas(&a, &result));
       EXPECT(result == false);
    }
 
    /* Some larger primes to check for false negatives */
-   for (int i = 0; i < 10; i++) {
+   for (i = 0; i < 10; i++) {
       result = false;
       DO(mp_read_radix(&a, medium_primes[i], 64));
       DO(mp_prime_extra_strong_lucas(&a, &result));
       EXPECT(result == true);
    }
 
    /* Some semi-primes */
-   for (int i = 0; i < 5; i++) {
+   for (i = 0; i < 5; i++) {
       result = false;
       DO(mp_read_radix(&a, medium_primes[i], 64));
       DO(mp_read_radix(&a, medium_primes[i+1], 64));
@@ -1513,7 +1517,7 @@ static int test_mp_log_n(void)
    mp_int a;
    mp_digit d;
    int base, lb, size;
-   const int max_base = MP_MIN(INT_MAX, MP_DIGIT_MAX);
+   const mp_digit max_base = MP_MIN(INT_MAX, MP_DIGIT_MAX);
 
    DOR(mp_init(&a));