gpgme/

2002-10-08  Marcus Brinkmann  <[email protected]>

	New data object component:

	* gpgme.h (GpgmeDataReadCb, GpgmeDataWriteCb, GpgmeDataSeekCb,
	GpgmeDataReleaseCb): New types.
	(struct GpgmeDataCbs): New structure.
	(gpgme_data_read): Changed prototype to match that of read() closely.
	(gpgme_data_write): Similar for write().
	(gpgme_data_seek, gpgme_data_new_from_cbs, gpgme_data_new_from_fd,
	gpgme_data_new_from_stream): New prototypes.
	(gpgme_data_get_type, gpgme_check_engine): Prototype removed.

	* Makefile.am (libgpgme_la_SOURCES): Add data.h, data-fd.c,
	data-stream.c, data-mem.c, data-user.c and data-compat.c.
	* data.c: Reimplemented from scratch.
	* (data-compat.c, data-fd.c, data.h, data-mem.c, data-stream.c,
	data-user.c): New file.
	* context.h (struct gpgme_data_s): Removed.
	* conversion.c: Include <errno.h> and <sys/types.h>.
	(_gpgme_data_append): New function.
	* data.c (_gpgme_data_append_string): Move to ...
	* conversion.c (_gpgme_data_append_string): ... here.
	* data.c (_gpgme_data_append_for_xml): Move to ...
	* conversion.c (_gpgme_data_append_for_xml): ... here.
	* data.c (_gpgme_data_append_string_for_xml): Move to ...
	* conversion.c (_gpgme_data_append_string_for_xml): ... here.
	* data.c (_gpgme_data_append_percentstring_for_xml): Move to ...
	* conversion.c (_gpgme_data_append_percentstring_for_xml): ... here.

	* ops.h (_gpgme_data_get_mode, _gpgme_data_set_mode): Prototype
	removed.
	* types.h (GpgmeDataMode): Type removed.

	* decrypt.c (_gpgme_decrypt_start): Don't check data type or mode.
	* edit.c (_gpgme_op_edit_start): Likewise.
	* encrypt.c (_gpgme_op_encrypt_start): Likewise.
	* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
	* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
	* export.c (_gpgme_op_export_start): Likewise.
	* genkey.c (_gpgme_op_genkey_start): Likewise.
	* import.c (_gpgme_op_import_start): Likewise.
	* sign.c (_gpgme_op_sign_start): Likewise.
	* verify.c (_gpgme_op_verify_start): Likewise.

	* encrypt.c (gpgme_op_encrypt): Remove hack that returns invalid
	no recipient if no data was returned.
	* encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns
	no recipient if no data was returned.
	* encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns
	no recipient if no data was returned.

	* engine.c (_gpgme_engine_op_verify): Add new argument to
	differentiate detached from normal signatures.
	* engine.h (_gpgme_engine_op_verify): Likewise for prototype.
	* engine-gpgsm.c (_gpgme_gpgsm_op_verify): Likewise.  Don't check
	mode of data argument.
	* engine-gpgsm.h (_gpgme_gpgsm_op_verify): Likewise for prototype.
	* gpgme.h (gpgme_op_verify_start): Likewise for prototype.
	(gpgme_op_verify): Likewise for prototype.
	* rungpg.c (_gpgme_gpg_op_verify): Likewise.
	* rungpg.h (_gpgme_gpg_op_verify): Likewise for prototype.
	* verify.c (_gpgme_op_verify_start): Likewise.
	(gpgme_op_verify_start): Likewise.
	(gpgme_op_verify): Likewise.

	* rungpg.c (struct arg_and_data_s): New member INBOUND to hold
	direction of data object.
	(_gpgme_gpg_add_data): Add new argument INBOUND.  Use it to
	determine direction of data object.
	(_gpgme_gpg_add_pm_data, _gpgme_gpg_set_command_handler,
	_gpgme_gpg_op_decrypt, _gpgme_gpg_op_edit, _gpgme_gpg_op_encrypt,
	_gpgme_gpg_op_encrypt_sign, _gpgme_gpg_op_export,
	_gpgme_gpg_op_genkey, _gpgme_gpg_op_import, _gpgme_gpg_op_sign,
	_gpgme_gpg_op_verify): Add new argument to _gpgme_gpg_add_data
	invocation.
	(build_argv): Use new member INBOUND to determine direction of
	file descriptor.  Don't check the data type.
	* rungpg.h (_gpgme_gpg_add_data): Add new argument to prototype.

	* gpgme.c (gpgme_get_op_info): Don't call
	_gpgme_data_get_as_string if CTX->op_info is NULL.

	* version.c (gpgme_check_engine): Function removed.


tests/
2002-10-09  Marcus Brinkmann  <[email protected]>

	* gpg/t-decrypt.c (print_data): Update to new gpgme_data_read
	interface, and use gpgme_engine_check_version instead
	gpgme_check_version.
	* gpg/t-decrypt-verify.c (print_data): Likewise.
	* gpg/t-edit.c (main): Likewise.
	* gpg/t-encrypt.c (print_data): Likewise.
	* gpg/t-encrypt-sign.c (print_data): Likewise.
	* gpg/t-encrypt-sym.c (print_data): Likewise.
	* gpg/t-eventloop.c (print_data): Likewise.
	* gpg/t-export.c (print_data): Likewise.
	* gpg/t-sign.c (print_data): Likewise.
	* gpg/t-signers.c (print_data): Likewise.
	* gpgsm/t-decrypt.c (print_data): Likewise.
	* gpgsm/t-encrypt.c (print_data): Likewise.
	* gpgsm/t-export.c (print_data): Likewise.
	* gpgsm/t-sign.c (print_data): Likewise.
	* gpg/t-verify.c (main): Likewise for gpgme_op_verify.
	* gpgsm/t-verify.c (main): Likewise for gpgme_op_verify.
	* t-data.c (read_once_test): Likewise.
	(write_test): Update for new behaviour of data objects.
	(main): Remove type test.

17 files changed, 250 insertions, 231 deletions

diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 0c85d1be..276f7e6d 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -42,21 +42,23 @@ struct passphrase_cb_info_s
                    exit (1); }					\
                              } while(0)
 
+
 static void
 print_data (GpgmeData dh)
 {
   char buf[100];
-  size_t nread;
-  GpgmeError err;
-
-  err = gpgme_data_rewind (dh);
-  fail_if_err (err);
-  while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
-    fwrite ( buf, nread, 1, stdout );
-  if (err != GPGME_EOF) 
-    fail_if_err (err);
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
+
 static const char *
 passphrase_cb (void *opaque, const char *desc, void **r_hd)
 {
diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c
index 6b21d416..0eda6acd 100644
--- a/tests/gpg/t-decrypt.c
+++ b/tests/gpg/t-decrypt.c
@@ -42,19 +42,33 @@ struct passphrase_cb_info_s {
                              } while(0)
 
 static void
-print_data ( GpgmeData dh )
+print_op_info (GpgmeCtx ctx)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
+  char *str = gpgme_get_op_info (ctx, 0);
+
+  if (!str)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (str);
+      free (str);
     }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+}
+
+
+static void
+print_data (GpgmeData dh)
+{
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c
index 4a22955a..8117d587 100644
--- a/tests/gpg/t-edit.c
+++ b/tests/gpg/t-edit.c
@@ -45,13 +45,15 @@ static void
 flush_data (GpgmeData dh)
 {
   char buf[100];
-  size_t nread;
-  GpgmeError err;
-
-  while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
-    fwrite (buf, nread, 1, stdout);
-  if (err != GPGME_EOF) 
-    fail_if_err (err);
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index b92d74c8..1517db0f 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -33,33 +33,33 @@
                              } while(0)
 
 static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
 {
-    char *s = gpgme_get_op_info (c, 0);
-
-    if (!s)
-        puts ("<!-- no operation info available -->");
-    else {
-        puts (s);
-        free (s);
+  char *str = gpgme_get_op_info (ctx, 0);
+
+  if (!str)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (str);
+      free (str);
     }
 }
 
 
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
@@ -92,7 +92,7 @@ main (int argc, char **argv )
     GpgmeRecipients rset;
     char *p;
 
-    err = gpgme_check_engine ();
+    err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
     fail_if_err (err);
     puts ( gpgme_get_engine_info() );
 
diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 441f747f..db3f3e9e 100644
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -36,15 +36,15 @@ static void
 print_data (GpgmeData dh)
 {
   char buf[100];
-  size_t nread;
-  GpgmeError err;
-
-  err = gpgme_data_rewind (dh);
-  fail_if_err (err);
-  while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
-    fwrite ( buf, nread, 1, stdout );
-  if (err != GPGME_EOF) 
-    fail_if_err (err);
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
@@ -79,7 +79,7 @@ main (int argc, char **argv)
   char *p;
   size_t len;
 
-  err = gpgme_check_engine ();
+  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
   fail_if_err (err);
 
   do
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 06736b3a..14a407d9 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -35,44 +35,44 @@
 static void
 print_op_info (GpgmeCtx c)
 {
-    char *s = gpgme_get_op_info (c, 0);
-
-    if (!s)
-        puts ("<!-- no operation info available -->");
-    else {
-        puts (s);
-        free (s);
+  char *s = gpgme_get_op_info (c, 0);
+
+  if (!s)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (s);
+      free (s);
     }
 }
 
 
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
 
 int 
-main (int argc, char **argv )
+main (int argc, char **argv)
 {
     GpgmeCtx ctx;
     GpgmeError err;
     GpgmeData in, out;
     GpgmeRecipients rset;
 
-    err = gpgme_check_engine ();
+    err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
     fail_if_err (err);
     puts ( gpgme_get_engine_info() );
 
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 634911af..887de64c 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -37,14 +37,14 @@
 static void
 print_op_info (GpgmeCtx ctx)
 {
-  char *s = gpgme_get_op_info (ctx, 0);
+  char *str = gpgme_get_op_info (ctx, 0);
 
-  if (!s)
+  if (!str)
     puts ("<!-- no operation info available -->");
   else
     {
-      puts (s);
-      free (s);
+      puts (str);
+      free (str);
     }
 }
 
@@ -53,15 +53,15 @@ static void
 print_data (GpgmeData dh)
 {
   char buf[100];
-  size_t nread;
-  GpgmeError err;
-
-  err = gpgme_data_rewind (dh);
-  fail_if_err (err);
-  while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
-    fwrite (buf, nread, 1, stdout);
-  if (err != GPGME_EOF) 
-    fail_if_err (err);
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
   for (i = 0; i < FDLIST_MAX; i++)
     fdlist[i].fd = -1;
 
-  err = gpgme_check_engine ();
+  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
   fail_if_err (err);
   puts (gpgme_get_engine_info ());
 
diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index 373e9f5c..dbcdd884 100644
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -32,24 +32,22 @@
                                 exit (1); }                               \
                              } while(0)
 
+
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
-
-
 int 
 main (int argc, char **argv )
 {
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index d77cd702..24edef50 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -149,7 +149,7 @@ main (int argc, char **argv)
     }
   pattern = argc? *argv : NULL;
 
-  err = gpgme_check_engine();
+  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
   fail_if_err (err);
 
   err = gpgme_new (&ctx);
diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c
index 0e5f5c36..9caaf696 100644
--- a/tests/gpg/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -33,34 +33,36 @@
                              } while(0)
 
 static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
 {
-    char *s = gpgme_get_op_info (c, 0);
-
-    if (!s)
-        puts ("<!-- no operation info available -->");
-    else {
-        puts (s);
-        free (s);
+  char *str = gpgme_get_op_info (ctx, 0);
+
+  if (!str)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (str);
+      free (str);
     }
 }
 
+
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
+
 static const char *
 passphrase_cb ( void *opaque, const char *desc, void **r_hd )
 {
diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c
index d0aa00b3..2e8d3f41 100644
--- a/tests/gpg/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -33,34 +33,36 @@
                              } while(0)
 
 static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
 {
-  char *s = gpgme_get_op_info (c, 0);
+  char *str = gpgme_get_op_info (ctx, 0);
 
-  if (!s)
+  if (!str)
     puts ("<!-- no operation info available -->");
   else
     {
-      puts (s);
-      free (s);
+      puts (str);
+      free (str);
     }
 }
 
+
 static void
 print_data (GpgmeData dh)
 {
   char buf[100];
-  size_t nread;
-  GpgmeError err;
-
-  err = gpgme_data_rewind (dh);
-  fail_if_err (err);
-  while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
-    fwrite (buf, nread, 1, stdout);
-  if (err != GPGME_EOF) 
-    fail_if_err (err);
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
+
 static const char *
 passphrase_cb (void *opaque, const char *desc, void **r_hd)
 {
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 13eca934..f12b6068 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -188,25 +188,25 @@ main (int argc, char **argv )
     fail_if_err (err);
 
     puts ("checking a valid message:\n");
-    err = gpgme_op_verify (ctx, sig, text, &status );
+    err = gpgme_op_verify (ctx, sig, text, NULL, &status);
     fail_if_err (err);
-    print_sig_stat ( ctx, status );
+    print_sig_stat (ctx, status);
     if (status != GPGME_SIG_STAT_GOOD)
       {
 	fprintf (stderr, "%s:%d: Wrong sig stat\n", __FILE__, __LINE__);
 	exit (1);
       }
 
-    if ( (nota=gpgme_get_notation (ctx)) )
+    if ((nota = gpgme_get_notation (ctx)))
         printf ("---Begin Notation---\n%s---End Notation---\n", nota );
 
     puts ("checking a manipulated message:\n");
     gpgme_data_release (text);
-    err = gpgme_data_new_from_mem ( &text,
-                                    test_text1f, strlen (test_text1f), 0 );
+    err = gpgme_data_new_from_mem (&text,
+				   test_text1f, strlen (test_text1f), 0);
     fail_if_err (err);
-    gpgme_data_rewind ( sig );
-    err = gpgme_op_verify (ctx, sig, text, &status );
+    gpgme_data_rewind (sig);
+    err = gpgme_op_verify (ctx, sig, text, NULL, &status);
     fail_if_err (err);
 
     print_sig_stat (ctx, status);
@@ -215,17 +215,17 @@ main (int argc, char **argv )
 	fprintf (stderr, "%s:%d: Wrong sig stat\n", __FILE__, __LINE__);
 	exit (1);
       }
-    if ( (nota=gpgme_get_notation (ctx)) )
+    if ((nota = gpgme_get_notation (ctx)))
         printf ("---Begin Notation---\n%s---End Notation---\n", nota );
 
     puts ("checking a normal signature:");
     gpgme_data_release (sig);
     gpgme_data_release (text);
-    err = gpgme_data_new_from_mem (&sig,  test_sig2, strlen (test_sig2), 0);
+    err = gpgme_data_new_from_mem (&sig, test_sig2, strlen (test_sig2), 0);
     fail_if_err (err);
     err = gpgme_data_new (&text);
     fail_if_err (err);
-    err = gpgme_op_verify (ctx, sig, text, &status);
+    err = gpgme_op_verify (ctx, sig, NULL, text, &status);
     fail_if_err (err);
 
     nota = gpgme_data_release_and_get_mem (text, &len);
diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c
index 212fcf8f..7b8e186b 100644
--- a/tests/gpgsm/t-decrypt.c
+++ b/tests/gpgsm/t-decrypt.c
@@ -49,21 +49,21 @@ static const char test_cip1[] =
                              } while(0)
 
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
+
 int 
 main (int argc, char **argv )
 {
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 9a7358c2..54096245 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -33,37 +33,36 @@
                              } while(0)
 
 static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
 {
-    char *s = gpgme_get_op_info (c, 0);
-
-    if (!s)
-        puts ("<!-- no operation info available -->");
-    else {
-        puts (s);
-        free (s);
+  char *str = gpgme_get_op_info (ctx, 0);
+
+  if (!str)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (str);
+      free (str);
     }
 }
 
 
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
-
 int 
 main (int argc, char **argv )
 {
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index a5f9e731..dd2ac548 100644
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -33,23 +33,21 @@
                              } while(0)
 
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
-
 int 
 main (int argc, char **argv )
 {
diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c
index 5d544755..b4c8332e 100644
--- a/tests/gpgsm/t-sign.c
+++ b/tests/gpgsm/t-sign.c
@@ -33,36 +33,38 @@
                              } while(0)
 
 static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
 {
-    char *s = gpgme_get_op_info (c, 0);
+  char *str = gpgme_get_op_info (ctx, 0);
 
-    if (!s)
-        puts ("<!-- no operation info available -->");
-    else {
-        puts (s);
-        free (s);
+  if (!str)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (str);
+      free (str);
     }
 }
 
+
 static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
 {
-    char buf[100];
-    size_t nread;
-    GpgmeError err;
-
-    err = gpgme_data_rewind ( dh );
-    fail_if_err (err);
-    while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
-        fwrite ( buf, nread, 1, stdout );
-    }
-    if (err != GPGME_EOF) 
-        fail_if_err (err);
+  char buf[100];
+  int ret;
+  
+  ret = gpgme_data_seek (dh, 0, SEEK_SET);
+  if (ret)
+    fail_if_err (GPGME_File_Error);
+  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
+
 int 
-main (int argc, char **argv )
+main (int argc, char **argv)
 {
     GpgmeCtx ctx;
     GpgmeError err;
diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index f65a83b6..715b3473 100644
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -186,33 +186,33 @@ main (int argc, char **argv )
     fail_if_err (err);
 
     puts ("checking a valid message:\n");
-    err = gpgme_op_verify (ctx, sig, text, &status );
-    print_sig_stat ( ctx, status );
-    print_sig_stat ( ctx, status );
-    print_sig_stat ( ctx, status );
-    print_sig_stat ( ctx, status );
+    err = gpgme_op_verify (ctx, sig, text, NULL, &status);
+    print_sig_stat (ctx, status);
+    print_sig_stat (ctx, status);
+    print_sig_stat (ctx, status);
+    print_sig_stat (ctx, status);
     fail_if_err (err);
 
     if ( (nota=gpgme_get_notation (ctx)) )
-        printf ("---Begin Notation---\n%s---End Notation---\n", nota );
+        printf ("---Begin Notation---\n%s---End Notation---\n", nota);
 
     puts ("checking a manipulated message:\n");
     gpgme_data_release (text);
     err = gpgme_data_new_from_mem ( &text,
-                                    test_text1f, strlen (test_text1f), 0 );
+                                    test_text1f, strlen (test_text1f), 0);
     fail_if_err (err);
     gpgme_data_rewind ( sig );
-    err = gpgme_op_verify (ctx, sig, text, &status );
+    err = gpgme_op_verify (ctx, sig, text, NULL, &status);
 
-    print_sig_stat ( ctx, status );
+    print_sig_stat (ctx, status);
     fail_if_err (err);
-    if ( (nota=gpgme_get_notation (ctx)) )
-        printf ("---Begin Notation---\n%s---End Notation---\n", nota );
+    if ((nota=gpgme_get_notation (ctx)))
+        printf ("---Begin Notation---\n%s---End Notation---\n", nota);
 
     gpgme_data_release (sig);
     gpgme_data_release (text);
- 
-} while ( argc > 1 && !strcmp( argv[1], "--loop" ) && ++n < 20 );
+    
+  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) && ++n < 20 );
       gpgme_release (ctx);
     
     return 0;