tests: Rename 'show' to 'info'.

--
Signed-off-by: Justus Winter <justus@g10code.com>

diff --git a/tests/hashtest.c b/tests/hashtest.c
index 33907fb..e4aacd9 100644 (file)
--- a/tests/hashtest.c
+++ b/tests/hashtest.c
@@ -158,7 +158,7 @@ fail (const char *format, ...)
 }
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -241,10 +241,10 @@ run_selftest (int algo)
     fail ("extended selftest for %s (%d) failed: %s",
           gcry_md_algo_name (algo), algo, gpg_strerror (err));
   else if (err && verbose)
-    show ("extended selftest for %s (%d) not implemented",
+    info ("extended selftest for %s (%d) not implemented",
           gcry_md_algo_name (algo), algo);
   else if (verbose)
-    show ("extended selftest for %s (%d) passed",
+    info ("extended selftest for %s (%d) passed",
           gcry_md_algo_name (algo), algo);
 }
 
@@ -268,7 +268,7 @@ cmp_digest (const unsigned char *digest, size_t digestlen,
     }
   if (!testvectors[idx].algo)
     {
-      show ("%d GiB %+3d %-10s warning: %s",
+      info ("%d GiB %+3d %-10s warning: %s",
             gigs, bytes, gcry_md_algo_name (algo), "no test vector");
       missing_test_vectors++;
       return 1;
@@ -499,7 +499,7 @@ main (int argc, char **argv)
     fail ("Some test vectors are missing");
 
   if (verbose)
-    show ("All tests completed in %s.  Errors: %d\n",
+    info ("All tests completed in %s.  Errors: %d\n",
           elapsed_time (1), error_count);
   return !!error_count;
 }

diff --git a/tests/keygen.c b/tests/keygen.c
index c4520e9..bbd5441 100644 (file)
--- a/tests/keygen.c
+++ b/tests/keygen.c
@@ -78,7 +78,7 @@ fail (const char *format, ...)
 }
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -197,7 +197,7 @@ check_rsa_keys (void)
   int rc;
 
   if (verbose)
-    show ("creating 2048 bit RSA key\n");
+    info ("creating 2048 bit RSA key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (rsa\n"
@@ -211,7 +211,7 @@ check_rsa_keys (void)
     die ("error generating RSA key: %s\n", gpg_strerror (rc));
 
   if (verbose)
-    show ("creating 1024 bit RSA key\n");
+    info ("creating 1024 bit RSA key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (rsa\n"
@@ -237,7 +237,7 @@ check_rsa_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating 2048 bit RSA key with e=65539\n");
+    info ("creating 2048 bit RSA key with e=65539\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (rsa\n"
@@ -257,7 +257,7 @@ check_rsa_keys (void)
 
 
   if (verbose)
-    show ("creating 512 bit RSA key with e=257\n");
+    info ("creating 512 bit RSA key with e=257\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (rsa\n"
@@ -274,7 +274,7 @@ check_rsa_keys (void)
     fail ("generating 512 bit RSA key must not work!");
 
   if (verbose && rc && in_fips_mode)
-    show ("... correctly rejected key creation in FIPS mode (%s)\n",
+    info ("... correctly rejected key creation in FIPS mode (%s)\n",
           gpg_strerror (rc));
 
   if (!rc)
@@ -282,7 +282,7 @@ check_rsa_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating 512 bit RSA key with default e\n");
+    info ("creating 512 bit RSA key with default e\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (rsa\n"
@@ -299,7 +299,7 @@ check_rsa_keys (void)
     fail ("generating 512 bit RSA key must not work!");
 
   if (verbose && rc && in_fips_mode)
-    show ("... correctly rejected key creation in FIPS mode (%s)\n",
+    info ("... correctly rejected key creation in FIPS mode (%s)\n",
           gpg_strerror (rc));
 
 
@@ -316,7 +316,7 @@ check_elg_keys (void)
   int rc;
 
   if (verbose)
-    show ("creating 1024 bit Elgamal key\n");
+    info ("creating 1024 bit Elgamal key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (elg\n"
@@ -344,7 +344,7 @@ check_dsa_keys (void)
   /* Check that DSA generation works and that it can grok the qbits
      argument. */
   if (verbose)
-    show ("creating 5 1024 bit DSA keys\n");
+    info ("creating 5 1024 bit DSA keys\n");
   for (i=0; i < 5; i++)
     {
       rc = gcry_sexp_new (&keyparm,
@@ -366,7 +366,7 @@ check_dsa_keys (void)
     }
 
   if (verbose)
-    show ("creating 1536 bit DSA key\n");
+    info ("creating 1536 bit DSA key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (dsa\n"
@@ -386,7 +386,7 @@ check_dsa_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating 3072 bit DSA key\n");
+    info ("creating 3072 bit DSA key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (dsa\n"
@@ -404,7 +404,7 @@ check_dsa_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating 2048/256 bit DSA key\n");
+    info ("creating 2048/256 bit DSA key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (dsa\n"
@@ -422,7 +422,7 @@ check_dsa_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating 2048/224 bit DSA key\n");
+    info ("creating 2048/224 bit DSA key\n");
   rc = gcry_sexp_new (&keyparm,
                       "(genkey\n"
                       " (dsa\n"
@@ -488,7 +488,7 @@ check_ecc_keys (void)
   for (testno=0; curves[testno]; testno++)
     {
       if (verbose)
-        show ("creating ECC key using curve %s\n", curves[testno]);
+        info ("creating ECC key using curve %s\n", curves[testno]);
       if (!strcmp (curves[testno], "Ed25519"))
         {
           /* Ed25519 isn't allowed in fips mode */
@@ -519,7 +519,7 @@ check_ecc_keys (void)
     }
 
   if (verbose)
-    show ("creating ECC key using curve Ed25519 for ECDSA\n");
+    info ("creating ECC key using curve Ed25519 for ECDSA\n");
   rc = gcry_sexp_build (&keyparm, NULL, "(genkey(ecc(curve Ed25519)))");
   if (rc)
     die ("error creating S-expression: %s\n", gpg_strerror (rc));
@@ -532,7 +532,7 @@ check_ecc_keys (void)
     fail ("generating Ed25519 key must not work!");
 
   if (verbose && rc && in_fips_mode)
-    show ("... correctly rejected key creation in FIPS mode (%s)\n",
+    info ("... correctly rejected key creation in FIPS mode (%s)\n",
           gpg_strerror (rc));
 
   if (!rc)
@@ -545,7 +545,7 @@ check_ecc_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating ECC key using curve Ed25519 for ECDSA (nocomp)\n");
+    info ("creating ECC key using curve Ed25519 for ECDSA (nocomp)\n");
   rc = gcry_sexp_build (&keyparm, NULL,
                         "(genkey(ecc(curve Ed25519)(flags nocomp)))");
   if (rc)
@@ -560,12 +560,12 @@ check_ecc_keys (void)
     fail ("generating Ed25519 key must not work in FIPS mode!");
 
   if (verbose && rc && in_fips_mode)
-    show ("... correctly rejected key creation in FIPS mode (%s)\n",
+    info ("... correctly rejected key creation in FIPS mode (%s)\n",
           gpg_strerror (rc));
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating ECC key using curve NIST P-384 for ECDSA\n");
+    info ("creating ECC key using curve NIST P-384 for ECDSA\n");
 
   /* Must be specified as nistp384 (one word), because ecc_generate
    * uses _gcry_sexp_nth_string which takes the first word of the name
@@ -586,7 +586,7 @@ check_ecc_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating ECC key using curve NIST P-384 for ECDSA (nocomp)\n");
+    info ("creating ECC key using curve NIST P-384 for ECDSA (nocomp)\n");
   rc = gcry_sexp_build (&keyparm, NULL,
                         "(genkey(ecc(curve nistp384)(flags nocomp)))");
   if (rc)
@@ -606,7 +606,7 @@ check_ecc_keys (void)
 
 
   if (verbose)
-    show ("creating ECC key using curve Ed25519 for ECDSA (transient-key)\n");
+    info ("creating ECC key using curve Ed25519 for ECDSA (transient-key)\n");
   rc = gcry_sexp_build (&keyparm, NULL,
                         "(genkey(ecc(curve Ed25519)(flags transient-key)))");
   if (rc)
@@ -621,7 +621,7 @@ check_ecc_keys (void)
     fail ("generating Ed25519 key must not work in FIPS mode!");
 
   if (verbose && rc && in_fips_mode)
-    show ("... correctly rejected key creation in FIPS mode (%s)\n",
+    info ("... correctly rejected key creation in FIPS mode (%s)\n",
           gpg_strerror (rc));
 
   if (!rc)
@@ -633,7 +633,7 @@ check_ecc_keys (void)
   gcry_sexp_release (key);
 
   if (verbose)
-    show ("creating ECC key using curve Ed25519 for ECDSA "
+    info ("creating ECC key using curve Ed25519 for ECDSA "
           "(transient-key no-keytest)\n");
   rc = gcry_sexp_build (&keyparm, NULL,
                         "(genkey(ecc(curve Ed25519)"
@@ -650,7 +650,7 @@ check_ecc_keys (void)
     fail ("generating Ed25519 key must not work in FIPS mode!");
 
   if (verbose && rc && in_fips_mode)
-    show ("... correctly rejected key creation in FIPS mode (%s)\n",
+    info ("... correctly rejected key creation in FIPS mode (%s)\n",
           gpg_strerror (rc));
 
   if (!rc)
@@ -671,7 +671,7 @@ check_nonce (void)
   int oops=0;
 
   if (verbose)
-    show ("checking gcry_create_nonce\n");
+    info ("checking gcry_create_nonce\n");
 
   gcry_create_nonce (a, sizeof a);
   for (i=0; i < 10; i++)

diff --git a/tests/random.c b/tests/random.c
index 65e5670..9e4055d 100644 (file)
--- a/tests/random.c
+++ b/tests/random.c
@@ -46,7 +46,7 @@ static int with_progress;
 /* If we have a decent libgpg-error we can use some gcc attributes.  */
 #ifdef GPGRT_ATTR_NORETURN
 static void die (const char *format, ...) GPGRT_ATTR_NR_PRINTF(1,2);
-static void inf (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
+static void info (const char *format, ...) GPGRT_ATTR_PRINTF(1,2);
 #endif /*GPGRT_ATTR_NORETURN*/
 
 
@@ -64,7 +64,7 @@ die (const char *format, ...)
 
 
 static void
-inf (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -80,7 +80,7 @@ print_hex (const char *text, const void *buf, size_t n)
 {
   const unsigned char *p = buf;
 
-  inf ("%s", text);
+  info ("%s", text);
   for (; n; n--, p++)
     fprintf (stderr, "%02X", *p);
   putc ('\n', stderr);
@@ -93,7 +93,7 @@ progress_cb (void *cb_data, const char *what, int printchar,
 {
   (void)cb_data;
 
-  inf ("progress (%s %c %d %d)\n", what, printchar, current, total);
+  info ("progress (%s %c %d %d)\n", what, printchar, current, total);
   fflush (stderr);
 }
 
@@ -159,7 +159,7 @@ check_forking (void)
 {
 #ifdef HAVE_W32_SYSTEM
   if (verbose)
-    inf ("check_forking skipped: not applicable on Windows\n");
+    info ("check_forking skipped: not applicable on Windows\n");
 #else /*!HAVE_W32_SYSTEM*/
   pid_t pid;
   int rp[2];
@@ -168,7 +168,7 @@ check_forking (void)
   char tmp1[16], tmp1c[16], tmp1p[16];
 
   if (verbose)
-    inf ("checking that a fork won't cause the same random output\n");
+    info ("checking that a fork won't cause the same random output\n");
 
   /* We better make sure that the RNG has been initialzied. */
   gcry_randomize (tmp1, sizeof tmp1, GCRY_STRONG_RANDOM);
@@ -224,7 +224,7 @@ check_nonce_forking (void)
 {
 #ifdef HAVE_W32_SYSTEM
   if (verbose)
-    inf ("check_nonce_forking skipped: not applicable on Windows\n");
+    info ("check_nonce_forking skipped: not applicable on Windows\n");
 #else /*!HAVE_W32_SYSTEM*/
   pid_t pid;
   int rp[2];
@@ -233,7 +233,7 @@ check_nonce_forking (void)
   char nonce1[10], nonce1c[10], nonce1p[10];
 
   if (verbose)
-    inf ("checking that a fork won't cause the same nonce output\n");
+    info ("checking that a fork won't cause the same nonce output\n");
 
   /* We won't get the same nonce back if we never initialized the
      nonce subsystem, thus we get one nonce here and forget about
@@ -290,14 +290,14 @@ check_close_random_device (void)
 {
 #ifdef HAVE_W32_SYSTEM
   if (verbose)
-    inf ("check_close_random_device skipped: not applicable on Windows\n");
+    info ("check_close_random_device skipped: not applicable on Windows\n");
 #else /*!HAVE_W32_SYSTEM*/
   pid_t pid;
   int i, status;
   char buf[4];
 
   if (verbose)
-    inf ("checking that close_random_device works\n");
+    info ("checking that close_random_device works\n");
 
   gcry_randomize (buf, sizeof buf, GCRY_STRONG_RANDOM);
   if (verbose)
@@ -349,11 +349,11 @@ check_rng_type_switching (void)
   char tmp1[4];
 
   if (verbose)
-    inf ("checking whether RNG type switching works\n");
+    info ("checking whether RNG type switching works\n");
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   initial = rngtype;
   gcry_randomize (tmp1, sizeof tmp1, GCRY_STRONG_RANDOM);
   if (debug)
@@ -365,7 +365,7 @@ check_rng_type_switching (void)
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   if (rngtype != initial)
     die ("switching to System RNG unexpectedly succeeded\n");
   gcry_randomize (tmp1, sizeof tmp1, GCRY_STRONG_RANDOM);
@@ -378,7 +378,7 @@ check_rng_type_switching (void)
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   if (rngtype != initial)
     die ("switching to FIPS RNG unexpectedly succeeded\n");
   gcry_randomize (tmp1, sizeof tmp1, GCRY_STRONG_RANDOM);
@@ -391,7 +391,7 @@ check_rng_type_switching (void)
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   if (rngtype != GCRY_RNG_TYPE_STANDARD)
     die ("switching to standard RNG failed\n");
   gcry_randomize (tmp1, sizeof tmp1, GCRY_STRONG_RANDOM);
@@ -408,18 +408,18 @@ check_early_rng_type_switching (void)
   int rngtype, initial;
 
   if (verbose)
-    inf ("checking whether RNG type switching works in the early stage\n");
+    info ("checking whether RNG type switching works in the early stage\n");
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   initial = rngtype;
 
   gcry_control (GCRYCTL_SET_PREFERRED_RNG_TYPE, GCRY_RNG_TYPE_SYSTEM);
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   if (initial >= GCRY_RNG_TYPE_SYSTEM && rngtype != GCRY_RNG_TYPE_SYSTEM)
     die ("switching to System RNG failed\n");
 
@@ -427,7 +427,7 @@ check_early_rng_type_switching (void)
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   if (initial >= GCRY_RNG_TYPE_FIPS && rngtype != GCRY_RNG_TYPE_FIPS)
     die ("switching to FIPS RNG failed\n");
 
@@ -435,7 +435,7 @@ check_early_rng_type_switching (void)
 
   rngtype = rng_type ();
   if (debug)
-    inf ("rng type: %d\n", rngtype);
+    info ("rng type: %d\n", rngtype);
   if (rngtype != GCRY_RNG_TYPE_STANDARD)
     die ("switching to standard RNG failed\n");
 }
@@ -472,7 +472,7 @@ check_drbg_reinit (void)
   gcry_buffer_t pers[1];
 
   if (verbose)
-    inf ("checking DRBG_REINIT\n");
+    info ("checking DRBG_REINIT\n");
 
   memset (pers, 0, sizeof pers);
   pers[0].data = pers_string;
@@ -558,7 +558,7 @@ run_all_rng_tests (const char *program)
   for (idx=0; options[idx]; idx++)
     {
       if (verbose)
-        inf ("now running with options '%s'\n", options[idx]);
+        info ("now running with options '%s'\n", options[idx]);
       strcpy (cmdline, program);
       strcat (cmdline, " --in-recursion");
       if (verbose)

diff --git a/tests/t-convert.c b/tests/t-convert.c
index 072bf32..7475158 100644 (file)
--- a/tests/t-convert.c
+++ b/tests/t-convert.c
@@ -45,7 +45,7 @@ static int error_count;
 #define pass() do { ; } while (0)
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -163,7 +163,7 @@ negative_zero (void)
   int i;
 
   if (debug)
-    show ("negative zero printing\n");
+    info ("negative zero printing\n");
 
   a = gcry_mpi_new (0);
   for (i=0; fmts[i].name; i++)
@@ -351,7 +351,7 @@ check_formats (void)
   for (idx=0; idx < DIM(data); idx++)
     {
       if (debug)
-        show ("print test %d\n", data[idx].value);
+        info ("print test %d\n", data[idx].value);
 
       if (data[idx].value < 0)
         {
@@ -371,8 +371,8 @@ check_formats (void)
             {
               fail ("error printing value %d as %s: %s\n",
                     data[idx].value, "HEX", "wrong result");
-              show ("expected: '%s'\n", data[idx].a.hex);
-              show ("     got: '%s'\n", buf);
+              info ("expected: '%s'\n", data[idx].a.hex);
+              info ("     got: '%s'\n", buf);
             }
           gcry_free (buf);
         }
@@ -457,7 +457,7 @@ check_formats (void)
   for (idx=0; idx < DIM(data); idx++)
     {
       if (debug)
-        show ("scan test %d\n", data[idx].value);
+        info ("scan test %d\n", data[idx].value);
 
       if (data[idx].value < 0)
         {
@@ -583,6 +583,6 @@ main (int argc, char **argv)
   negative_zero ();
   check_formats ();
 
-  show ("All tests completed. Errors: %d\n", error_count);
+  info ("All tests completed. Errors: %d\n", error_count);
   return error_count ? 1 : 0;
 }

diff --git a/tests/t-cv25519.c b/tests/t-cv25519.c
index 098c66a..9f90e17 100644 (file)
--- a/tests/t-cv25519.c
+++ b/tests/t-cv25519.c
@@ -105,7 +105,7 @@ fail (const char *format, ...)
 }
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -201,7 +201,7 @@ test_cv (int testno, const char *k_str, const char *u_str,
   size_t res_len;
 
   if (verbose > 1)
-    show ("Running test %d\n", testno);
+    info ("Running test %d\n", testno);
 
   if (!(buffer = hex2buffer (k_str, &buflen)) || buflen != 32)
     {
@@ -281,8 +281,8 @@ test_cv (int testno, const char *k_str, const char *u_str,
         {
           fail ("gcry_pk_encrypt failed for test %d: %s",
                 testno, "wrong value returned");
-          show ("  expected: '%s'", result_str);
-          show ("       got: '%s'", r0);
+          info ("  expected: '%s'", result_str);
+          info ("       got: '%s'", r0);
         }
       xfree (r0);
     }
@@ -320,7 +320,7 @@ test_it (int testno, const char *k_str, int iter, const char *result_str)
   gcry_mpi_t mpi_kk = NULL;
 
   if (verbose > 1)
-    show ("Running test %d: iteration=%d\n", testno, iter);
+    info ("Running test %d: iteration=%d\n", testno, iter);
 
   gcry_mpi_ec_new (&ctx, NULL, "Curve25519");
   Q = gcry_mpi_point_new (0);
@@ -390,8 +390,8 @@ test_it (int testno, const char *k_str, int iter, const char *result_str)
       {
         fail ("curv25519 failed for test %d: %s",
               testno, "wrong value returned");
-        show ("  expected: '%s'", result_str);
-        show ("       got: '%s'", r0);
+        info ("  expected: '%s'", result_str);
+        info ("       got: '%s'", r0);
       }
     xfree (r0);
   }
@@ -438,7 +438,7 @@ check_cv25519 (void)
 {
   int ntests;
 
-  show ("Checking Curve25519.\n");
+  info ("Checking Curve25519.\n");
 
   ntests = 0;
 
@@ -632,7 +632,7 @@ main (int argc, char **argv)
   check_cv25519 ();
   stop_timer ();
 
-  show ("All tests completed in %s.  Errors: %d\n",
+  info ("All tests completed in %s.  Errors: %d\n",
         elapsed_time (1), error_count);
   return !!error_count;
 }

diff --git a/tests/t-ed25519.c b/tests/t-ed25519.c
index d63c145..f0c44cc 100644 (file)
--- a/tests/t-ed25519.c
+++ b/tests/t-ed25519.c
@@ -90,7 +90,7 @@ fail (const char *format, ...)
 }
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -185,7 +185,7 @@ read_textline (FILE *fp, int *lineno)
     }
   while (!*line || *line == '#');
   /* if (debug) */
-  /*   show ("read line: '%s'\n", line); */
+  /*   info ("read line: '%s'\n", line); */
   return xstrdup (line);
 }
 
@@ -269,7 +269,7 @@ one_test (int testno, const char *sk, const char *pk,
   size_t sig_r_len, sig_s_len;
 
   if (verbose > 1)
-    show ("Running test %d\n", testno);
+    info ("Running test %d\n", testno);
 
   if (!(buffer = hex2buffer (sk, &buflen)))
     {
@@ -384,8 +384,8 @@ one_test (int testno, const char *sk, const char *pk,
         {
           fail ("gcry_pk_sign failed for test %d: %s",
                 testno, "wrong value returned");
-          show ("  expected: '%s'", sig);
-          show ("       got: '%s'", sig_rs_string);
+          info ("  expected: '%s'", sig);
+          info ("       got: '%s'", sig_rs_string);
         }
     }
 
@@ -417,7 +417,7 @@ check_ed25519 (const char *fname)
   int testno;
   char *sk, *pk, *msg, *sig;
 
-  show ("Checking Ed25519.\n");
+  info ("Checking Ed25519.\n");
 
   fp = fopen (fname, "r");
   if (!fp)
@@ -558,7 +558,7 @@ main (int argc, char **argv)
 
   xfree (fname);
 
-  show ("All tests completed in %s.  Errors: %d\n",
+  info ("All tests completed in %s.  Errors: %d\n",
         elapsed_time (1), error_count);
   return !!error_count;
 }

diff --git a/tests/t-mpi-bit.c b/tests/t-mpi-bit.c
index 3d7b793..df13f0c 100644 (file)
--- a/tests/t-mpi-bit.c
+++ b/tests/t-mpi-bit.c
@@ -42,7 +42,7 @@ static int error_count;
 #define pass() do { ; } while (0)
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -171,7 +171,7 @@ one_bit_only (int highbit)
   int i;
 
   wherestr = "one_bit_only";
-  show ("checking that set_%sbit does only set one bit\n", highbit?"high":"");
+  info ("checking that set_%sbit does only set one bit\n", highbit?"high":"");
 
   a = gcry_mpi_new (0);
   gcry_mpi_randomize (a, 70, GCRY_WEAK_RANDOM);
@@ -207,7 +207,7 @@ test_rshift (int pass)
   int i;
 
   wherestr = "test_rshift";
-  show ("checking that rshift works as expected (pass %d)\n", pass);
+  info ("checking that rshift works as expected (pass %d)\n", pass);
 
   a = gcry_mpi_new (0);
   b = gcry_mpi_new (0);
@@ -222,8 +222,8 @@ test_rshift (int pass)
       rshiftbitstring (result2, i);
       if (strcmp (result, result2))
         {
-          show ("got =%s\n", result);
-          show ("want=%s\n", result2);
+          info ("got =%s\n", result);
+          info ("want=%s\n", result2);
           fail ("rshift by %d failed\n", i);
         }
       xfree (result);
@@ -244,8 +244,8 @@ test_rshift (int pass)
       rshiftbitstring (result2, i);
       if (strcmp (result, result2))
         {
-          show ("got =%s\n", result);
-          show ("want=%s\n", result2);
+          info ("got =%s\n", result);
+          info ("want=%s\n", result2);
           fail ("in-place rshift by %d failed\n", i);
         }
       xfree (result2);
@@ -267,7 +267,7 @@ test_lshift (int pass)
   int i;
 
   wherestr = "test_lshift";
-  show ("checking that lshift works as expected (pass %d)\n", pass);
+  info ("checking that lshift works as expected (pass %d)\n", pass);
 
   for (size_idx=0; size_list[size_idx]; size_idx++)
     {
@@ -289,8 +289,8 @@ test_lshift (int pass)
           xfree (tmpstr);
           if (strcmp (result, result2))
             {
-              show ("got =%s\n", result);
-              show ("want=%s\n", result2);
+              info ("got =%s\n", result);
+              info ("want=%s\n", result2);
               fail ("lshift by %d failed\n", i);
             }
           xfree (result);
@@ -313,8 +313,8 @@ test_lshift (int pass)
           xfree (tmpstr);
           if (strcmp (result, result2))
             {
-              show ("got =%s\n", result);
-              show ("want=%s\n", result2);
+              info ("got =%s\n", result);
+              info ("want=%s\n", result2);
               fail ("in-place lshift by %d failed\n", i);
             }
           xfree (result2);
@@ -338,7 +338,7 @@ set_bit_with_resize (void)
   int i;
 
   wherestr = "set_bit_with_resize";
-  show ("checking that set_bit initializes all limbs\n");
+  info ("checking that set_bit initializes all limbs\n");
 
   a = gcry_mpi_new (1536);
   gcry_mpi_set_bit (a, 1536);
@@ -358,7 +358,7 @@ set_bit_with_resize (void)
   gcry_mpi_release (a);
 
   wherestr = "set_highbit_with_resize";
-  show ("checking that set_highbit initializes all limbs\n");
+  info ("checking that set_highbit initializes all limbs\n");
 
   a = gcry_mpi_new (1536);
   gcry_mpi_set_highbit (a, 1536);
@@ -410,6 +410,6 @@ main (int argc, char **argv)
 
   set_bit_with_resize ();
 
-  show ("All tests completed. Errors: %d\n", error_count);
+  info ("All tests completed. Errors: %d\n", error_count);
   return error_count ? 1 : 0;
 }

diff --git a/tests/t-mpi-point.c b/tests/t-mpi-point.c
index 84da7cc..a2c3cc0 100644 (file)
--- a/tests/t-mpi-point.c
+++ b/tests/t-mpi-point.c
@@ -167,7 +167,7 @@ static const char sample_ed25519_d[] =
 
 
 static void
-show (const char *format, ...)
+info (const char *format, ...)
 {
   va_list arg_ptr;
 
@@ -375,7 +375,7 @@ set_get_point (void)
   gcry_mpi_t x, y, z;
 
   wherestr = "set_get_point";
-  show ("checking point setting functions\n");
+  info ("checking point setting functions\n");
 
   point = gcry_mpi_point_new (0);
   x = gcry_mpi_set_ui (NULL, 17);
@@ -430,7 +430,7 @@ context_alloc (void)
   gcry_mpi_t p, a;
 
   wherestr = "context_alloc";
-  show ("checking context functions\n");
+  info ("checking context functions\n");
 
   p = gcry_mpi_set_ui (NULL, 1);
   a = gcry_mpi_set_ui (NULL, 1);
@@ -537,7 +537,7 @@ context_param (void)
 
   wherestr = "context_param";
 
-  show ("checking standard curves\n");
+  info ("checking standard curves\n");
   for (idx=0; test_curve[idx].desc; idx++)
     {
       /* P-192 and Ed25519 are not supported in fips mode */
@@ -546,7 +546,7 @@ context_param (void)
           if (!strcmp(test_curve[idx].desc, "NIST P-192")
               || !strcmp(test_curve[idx].desc, "Ed25519"))
             {
-             show("skipping %s in fips mode\n", test_curve[idx].desc );
+             info ("skipping %s in fips mode\n", test_curve[idx].desc );
               continue;
             }
         }
@@ -579,7 +579,7 @@ context_param (void)
 
     }
 
-  show ("checking sample public key (nistp256)\n");
+  info ("checking sample public key (nistp256)\n");
   q = hex2mpi (sample_p256_q);
   err = gcry_sexp_build (&keyparam, NULL,
                         "(public-key(ecc(curve %s)(q %m)))",
@@ -650,7 +650,7 @@ context_param (void)
   if (gcry_fips_mode_active())
     goto cleanup;
 
-  show ("checking sample public key (Ed25519)\n");
+  info ("checking sample public key (Ed25519)\n");
   q = hex2mpi (sample_ed25519_q);
   gcry_sexp_release (keyparam);
   err = gcry_sexp_build (&keyparam, NULL,
@@ -772,7 +772,7 @@ basic_ec_math (void)
   gcry_mpi_t x, y, z;
 
   wherestr = "basic_ec_math";
-  show ("checking basic math functions for EC\n");
+  info ("checking basic math functions for EC\n");
 
   P = hex2mpi ("0xfffffffffffffffffffffffffffffffeffffffffffffffff");
   A = hex2mpi ("0xfffffffffffffffffffffffffffffffefffffffffffffffc");
@@ -852,7 +852,7 @@ basic_ec_math_simplified (void)
   gcry_sexp_t sexp;
 
   wherestr = "basic_ec_math_simplified";
-  show ("checking basic math functions for EC (variant)\n");
+  info ("checking basic math functions for EC (variant)\n");
 
   d = hex2mpi ("D4EF27E32F8AD8E2A1C6DDEBB1D235A69E3CEF9BCE90273D");
   Q = gcry_mpi_point_new (0);
@@ -969,7 +969,7 @@ twistededwards_math (void)
   gcry_mpi_t w, a, x, y, z, p, n, b, I;
 
   wherestr = "twistededwards_math";
-  show ("checking basic Twisted Edwards math\n");
+  info ("checking basic Twisted Edwards math\n");
 
   err = gcry_mpi_ec_new (&ctx, NULL, "Ed25519");
   if (err)
@@ -1126,6 +1126,6 @@ main (int argc, char **argv)
       twistededwards_math ();
     }
 
-  show ("All tests completed. Errors: %d\n", error_count);
+  info ("All tests completed. Errors: %d\n", error_count);
   return error_count ? 1 : 0;
 }