2003-06-14 Moritz Schulte <moritz@g10code.com>

	* basic.c: Replaced calls to gcry_strerror with calls to
	gpg_strerror.
	(check_one_md): Adjust for new gcry_md_copy API.

	* tsexp.c: Likewise.
	* keygen.c: Likewise.

4 files changed, 25 insertions, 16 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9aa7083d..08328d82 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-14  Moritz Schulte  <moritz@g10code.com>
+
+	* basic.c: Replaced calls to gcry_strerror with calls to
+	gpg_strerror.
+	(check_one_md): Adjust for new gcry_md_copy API.
+
+	* tsexp.c: Likewise.
+	* keygen.c: Likewise.
+
 2003-06-12  Moritz Schulte  <moritz@g10code.com>
 
 	* basic.c: Changed here and there, reorganized pubkey checks,
diff --git a/tests/basic.c b/tests/basic.c
index a8287f04..3f9cd8ad 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -601,7 +601,7 @@ check_one_md (int algo, char *data, int len, char *expect)
   else
     gcry_md_write (hd, data, len);
 
-  err = gcry_md_copy (hd, &hd2);
+  err = gcry_md_copy (&hd2, hd);
   if (err)
     {
       fail ("algo %d, gcry_md_copy failed: %s\n", algo, gpg_strerror (err));
@@ -772,11 +772,11 @@ verify_one_signature (gcry_sexp_t pkey, gcry_sexp_t hash,
 
   rc = gcry_pk_verify (sig, hash, pkey);
   if (rc)
-    fail ("gcry_pk_verify failed: %s\n", gcry_strerror (rc));
+    fail ("gcry_pk_verify failed: %s\n", gpg_strerror (rc));
   rc = gcry_pk_verify (sig, badhash, pkey);
   if (gpg_err_code (rc) != GPG_ERR_BAD_SIGNATURE)
     fail ("gcry_pk_verify failed to detect a bad signature: %s\n",
-	  gcry_strerror (rc));
+	  gpg_strerror (rc));
 }
 
 
@@ -821,7 +821,7 @@ check_pubkey_sign (int n, gcry_sexp_t skey, gcry_sexp_t pkey)
 
   rc = gcry_sexp_sscan (&badhash, NULL, baddata, strlen (baddata));
   if (rc)
-    die ("converting data failed: %s\n", gcry_strerror (rc));
+    die ("converting data failed: %s\n", gpg_strerror (rc));
 
   for (dataidx = 0; datas[dataidx].data; dataidx++)
     {
@@ -831,11 +831,11 @@ check_pubkey_sign (int n, gcry_sexp_t skey, gcry_sexp_t pkey)
       rc = gcry_sexp_sscan (&hash, NULL, datas[dataidx].data,
 			    strlen (datas[dataidx].data));
       if (rc)
-	die ("converting data failed: %s\n", gcry_strerror (rc));
+	die ("converting data failed: %s\n", gpg_strerror (rc));
 
       rc = gcry_pk_sign (&sig, hash, skey);
       if (gpg_err_code (rc) != datas[dataidx].expected_rc)
-	fail ("gcry_pk_sign failed: %s\n", gcry_strerror (rc));
+	fail ("gcry_pk_sign failed: %s\n", gpg_strerror (rc));
 
       if (!rc)
 	verify_one_signature (pkey, hash, badhash, sig);
diff --git a/tests/keygen.c b/tests/keygen.c
index f8d1a28d..4dbd5976 100644
--- a/tests/keygen.c
+++ b/tests/keygen.c
@@ -62,7 +62,7 @@ print_mpi (const char *text, gcry_mpi_t a)
   rc = gcry_mpi_aprint (GCRYMPI_FMT_HEX, bufaddr, NULL, a);
   if (rc)
     fprintf (stderr, "%s=[error printing number: %s]\n",
-             text, gcry_strerror (rc));
+             text, gpg_strerror (rc));
   else
     {
       fprintf (stderr, "%s=0x%s\n", text, buf);
@@ -108,7 +108,7 @@ check_generated_rsa_key (gcry_sexp_t key, unsigned long expected_e)
     {
       int rc = gcry_pk_testkey (skey);
       if (rc)
-        fail ("gcry_pk_testkey failed: %s\n", gcry_strerror (rc));
+        fail ("gcry_pk_testkey failed: %s\n", gpg_strerror (rc));
       gcry_sexp_release (skey);
     }
 
@@ -128,11 +128,11 @@ check_rsa_keys (void)
                       "  (nbits 4:1024)\n"
                       " ))", 0, 1);
   if (rc)
-    die ("error creating S-expression: %s\n", gcry_strerror (rc));
+    die ("error creating S-expression: %s\n", gpg_strerror (rc));
   rc = gcry_pk_genkey (&key, keyparm);
   gcry_sexp_release (keyparm);
   if (rc)
-    die ("error generating RSA key: %s\n", gcry_strerror (rc));
+    die ("error generating RSA key: %s\n", gpg_strerror (rc));
 
   check_generated_rsa_key (key, 65537);
   gcry_sexp_release (key);
@@ -146,11 +146,11 @@ check_rsa_keys (void)
                       "  (rsa-use-e 3:257)\n"
                       " ))", 0, 1);
   if (rc)
-    die ("error creating S-expression: %s\n", gcry_strerror (rc));
+    die ("error creating S-expression: %s\n", gpg_strerror (rc));
   rc = gcry_pk_genkey (&key, keyparm);
   gcry_sexp_release (keyparm);
   if (rc)
-    die ("error generating RSA key: %s\n", gcry_strerror (rc));
+    die ("error generating RSA key: %s\n", gpg_strerror (rc));
 
   check_generated_rsa_key (key, 257);
   gcry_sexp_release (key);
@@ -164,11 +164,11 @@ check_rsa_keys (void)
                       "  (rsa-use-e 1:0)\n"
                       " ))", 0, 1);
   if (rc)
-    die ("error creating S-expression: %s\n", gcry_strerror (rc));
+    die ("error creating S-expression: %s\n", gpg_strerror (rc));
   rc = gcry_pk_genkey (&key, keyparm);
   gcry_sexp_release (keyparm);
   if (rc)
-    die ("error generating RSA key: %s\n", gcry_strerror (rc));
+    die ("error generating RSA key: %s\n", gpg_strerror (rc));
 
   check_generated_rsa_key (key, 0); /* We don't expect a constant exponent. */
   gcry_sexp_release (key);
diff --git a/tests/tsexp.c b/tests/tsexp.c
index 795a0b4e..44396f3a 100644
--- a/tests/tsexp.c
+++ b/tests/tsexp.c
@@ -224,7 +224,7 @@ back_and_forth_one (int testno, const char *buffer, size_t length)
   rc = gcry_sexp_new (&se, buffer, length, 1);
   if (rc)
     {
-      fail ("baf %d: gcry_sexp_new failed: %s\n", testno, gcry_strerror (rc));
+      fail ("baf %d: gcry_sexp_new failed: %s\n", testno, gpg_strerror (rc));
       return;
     }
   n1 = gcry_sexp_sprint (se, GCRYSEXP_FMT_CANON, NULL, 0);
@@ -244,7 +244,7 @@ back_and_forth_one (int testno, const char *buffer, size_t length)
   if (rc)
     {
       fail ("baf %d: gcry_sexp_create failed: %s\n",
-            testno, gcry_strerror (rc));
+            testno, gpg_strerror (rc));
       return;
     }
   gcry_sexp_release (se1);