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

	* register.c: Adjust cipher specification structure.

	* Makefile.am (EXTRA_PROGRAMS): Set to: benchmark testapi.
	(check_PROGRAMS): Set to: $(TESTS).

2003-07-12  Moritz Schulte  <moritz@g10code.com>

	* ac.c, basic.c, keygen.c, register.c, sexp.c, tsexp.c: Used
	gcry_err* wrappers for libgpg symbols.

	* basic.c (check_ciphers): Added: GCRY_CIPHER_TWOFISH128.

7 files changed, 41 insertions, 26 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9ffdf189..4536fb68 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,20 @@
+2003-07-14  Moritz Schulte  <moritz@g10code.com>
+
+	* register.c: Adjust cipher specification structure.
+
+	* benchmark.c: New file.
+	* testapi.c: New file.
+
+	* Makefile.am (EXTRA_PROGRAMS): Set to: benchmark testapi.
+	(check_PROGRAMS): Set to: $(TESTS).
+
+2003-07-12  Moritz Schulte  <moritz@g10code.com>
+
+	* ac.c, basic.c, keygen.c, register.c, sexp.c, tsexp.c: Used
+	gcry_err* wrappers for libgpg symbols.
+
+	* basic.c (check_ciphers): Added: GCRY_CIPHER_TWOFISH128.
+
 2003-07-08  Moritz Schulte  <moritz@g10code.com>
 
 	* Makefile.am (LIBS): Remove: -lpthread.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b8851bd9..057dd698 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,15 +18,12 @@
 
 ## Process this file with automake to produce Makefile.in
 
-
-# TESTS_ENVIRONMENT =  
-
 TESTS = register ac basic tsexp keygen pubkey
 
-EXTRA_DIST = 
-
 INCLUDES = -I$(top_srcdir)/src
 LDADD = ../src/libgcrypt.la
 
-noinst_PROGRAMS = $(TESTS) 
+EXTRA_PROGRAMS = benchmark testapi
+check_PROGRAMS = $(TESTS)
+
 AM_CFLAGS = @GPG_ERROR_CFLAGS@
diff --git a/tests/ac.c b/tests/ac.c
index a3532cdc..0e084810 100644
--- a/tests/ac.c
+++ b/tests/ac.c
@@ -45,7 +45,7 @@ check_run (void)
   gcry_ac_handle_t handle;
   gcry_ac_key_pair_t key_pair;
   gcry_ac_key_t key_sec, key_pub;
-  gpg_error_t err = 0;
+  gcry_error_t err = 0;
   unsigned int a = 0x4223;
   gcry_mpi_t x, x2;
   gcry_ac_data_t data, data2;
@@ -106,7 +106,7 @@ check_run (void)
     assert (! err);
 
     err = gcry_ac_data_verify (handle, key_pub, x, data);
-    assert (gpg_err_code (err) == GPG_ERR_BAD_SIGNATURE);
+    assert (gcry_err_code (err) == GPG_ERR_BAD_SIGNATURE);
   }
 
   gcry_ac_close (handle);
diff --git a/tests/basic.c b/tests/basic.c
index d3570e36..a5c7ab5e 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -108,7 +108,7 @@ check_cbc_mac_cipher (void)
   gcry_cipher_hd_t hd;
   char out[MAX_DATA_LEN];
   int i, blklen, keylen;
-  gpg_error_t err = 0;
+  gcry_error_t err = 0;
 
   for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)
     {
@@ -225,7 +225,7 @@ check_aes128_cbc_cts_cipher ()
   gcry_cipher_hd_t hd;
   char out[MAX_DATA_LEN];
   int i;
-  gpg_error_t err = 0;
+  gcry_error_t err = 0;
 
   err = gcry_cipher_open (&hd,
 			  GCRY_CIPHER_AES,
@@ -368,7 +368,7 @@ check_ctr_cipher (void)
   gcry_cipher_hd_t hde, hdd;
   char out[MAX_DATA_LEN];
   int i, j, keylen, blklen;
-  gpg_error_t err = 0;
+  gcry_error_t err = 0;
 
   for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)
     {
@@ -463,7 +463,7 @@ check_one_cipher (int algo, int mode, int flags)
   gcry_cipher_hd_t hd;
   char key[32], plain[16], in[16], out[16];
   int keylen;
-  gpg_error_t err = 0;
+  gcry_error_t err = 0;
 
   memcpy (key, "0123456789abcdef.,;/[]{}-=ABCDEF", 32);
   memcpy (plain, "foobar42FOOBAR17", 16);
@@ -537,6 +537,7 @@ check_ciphers (void)
     GCRY_CIPHER_AES192,
     GCRY_CIPHER_AES256,
     GCRY_CIPHER_TWOFISH,
+    GCRY_CIPHER_TWOFISH128,
     GCRY_CIPHER_DES,
     0
   };
@@ -580,7 +581,7 @@ check_one_md (int algo, char *data, int len, char *expect)
   char *p;
   int mdlen;
   int i;
-  gpg_error_t err = 0;
+  gcry_error_t err = 0;
 
   err = gcry_md_open (&hd, algo, 0);
   if (err)
@@ -774,13 +775,13 @@ static void
 verify_one_signature (gcry_sexp_t pkey, gcry_sexp_t hash,
 		      gcry_sexp_t badhash, gcry_sexp_t sig)
 {
-  gpg_error_t rc;
+  gcry_error_t rc;
 
   rc = gcry_pk_verify (sig, hash, pkey);
   if (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)
+  if (gcry_err_code (rc) != GPG_ERR_BAD_SIGNATURE)
     fail ("gcry_pk_verify failed to detect a bad signature: %s\n",
 	  gpg_strerror (rc));
 }
@@ -791,7 +792,7 @@ verify_one_signature (gcry_sexp_t pkey, gcry_sexp_t hash,
 static void
 check_pubkey_sign (int n, gcry_sexp_t skey, gcry_sexp_t pkey)
 {
-  gpg_error_t rc;
+  gcry_error_t rc;
   gcry_sexp_t sig, badhash, hash;
   int dataidx;
   static const char baddata[] =
@@ -840,7 +841,7 @@ check_pubkey_sign (int n, gcry_sexp_t skey, gcry_sexp_t pkey)
 	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)
+      if (gcry_err_code (rc) != datas[dataidx].expected_rc)
 	fail ("gcry_pk_sign failed: %s\n", gpg_strerror (rc));
 
       if (!rc)
@@ -884,7 +885,7 @@ do_check_one_pubkey (int n, gcry_sexp_t skey, gcry_sexp_t pkey,
 static void
 check_one_pubkey (int n, test_spec_pubkey_t spec)
 {
-  gpg_error_t err = GPG_ERR_NO_ERROR;
+  gcry_error_t err = GPG_ERR_NO_ERROR;
   gcry_sexp_t skey, pkey;
 
   err = gcry_sexp_sscan (&skey, NULL, spec.key.secret,
diff --git a/tests/keygen.c b/tests/keygen.c
index 4dbd5976..1d855f07 100644
--- a/tests/keygen.c
+++ b/tests/keygen.c
@@ -57,7 +57,7 @@ print_mpi (const char *text, gcry_mpi_t a)
 {
   char *buf;
   void *bufaddr = &buf;
-  gpg_error_t rc;
+  gcry_error_t rc;
 
   rc = gcry_mpi_aprint (GCRYMPI_FMT_HEX, bufaddr, NULL, a);
   if (rc)
diff --git a/tests/register.c b/tests/register.c
index 52063e8b..a973abed 100644
--- a/tests/register.c
+++ b/tests/register.c
@@ -39,7 +39,7 @@ die (const char *format, ...)
   exit (1);
 }
 
-gpg_err_code_t
+gcry_err_code_t
 foo_setkey (void *c, const unsigned char *key, unsigned keylen)
 {
   return 0;
@@ -67,7 +67,7 @@ foo_decrypt (void *c, unsigned char *outbuf, const unsigned char *inbuf)
 
 gcry_cipher_spec_t cipher_spec_foo =
   {
-    "FOO", 16, 0, 0,
+    "FOO", NULL, 16, 0, 0,
     foo_setkey, foo_encrypt, foo_decrypt,
     NULL, NULL,
   };
@@ -75,7 +75,7 @@ gcry_cipher_spec_t cipher_spec_foo =
 int
 check_list (int algorithm)
 {
-  gpg_error_t err = GPG_ERR_NO_ERROR;
+  gcry_error_t err = GPG_ERR_NO_ERROR;
   int *list, list_length;
   int i, ret = 0;
 
diff --git a/tests/tsexp.c b/tests/tsexp.c
index 44396f3a..d725f744 100644
--- a/tests/tsexp.c
+++ b/tests/tsexp.c
@@ -165,7 +165,7 @@ canon_len (void)
     size_t textlen; /* length of the buffer */
     size_t expected;/* expected length or 0 on error and then ... */
     size_t erroff;  /* ... and at this offset */
-    gpg_error_t errcode;    /* ... with this error code */
+    gcry_error_t errcode;    /* ... with this error code */
     unsigned char *text; 
   } values[] = {
     { 14, 13, 0, GPG_ERR_NO_ERROR, "(9:abcdefghi) " },
@@ -186,7 +186,7 @@ canon_len (void)
     { 0 },
   };
   int idx;
-  gpg_error_t errcode;
+  gcry_error_t errcode;
   size_t n, erroff;
 
   info ("checking canoncial length test function\n");
@@ -202,7 +202,7 @@ canon_len (void)
           if (values[idx].erroff != erroff)
             fail ("canonical length test %d - wrong error offset %u\n",
                   idx, (unsigned int)erroff);
-          if (gpg_err_code (errcode) != values[idx].errcode)
+          if (gcry_err_code (errcode) != values[idx].errcode)
             fail ("canonical length test %d - wrong error code %d\n",
                   idx, errcode);
         }
@@ -216,7 +216,7 @@ canon_len (void)
 static void
 back_and_forth_one (int testno, const char *buffer, size_t length)
 {
-  gpg_error_t rc;
+  gcry_error_t rc;
   gcry_sexp_t se, se1;
   size_t n, n1;
   char *p1;