doc/

2003-05-28  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Exporting Keys): Change argument type from
	gpgme_recipient_t to gpgme_user_id_t.
	(Encrypting a Plaintext): Likewise.
	(Selecting Recipients): Rewritten.

gpgme/
2003-05-28  Marcus Brinkmann  <[email protected]>

	* Makefile.am (libgpgme_la_SOURCES): Remove recipient.c, add
	user-id.c.
	* gpgme.h (gpgme_recipients_t): Removed.
	(gpgme_recipients_new, gpgme_recipients_release,
	gpgme_recipients_add_name,
	gpgme_recipients_add_name_with_validity, gpgme_recipients_count,
	gpgme_recipients_enum_open, gpgme_recipients_enum_read,
	gpgme_recipients_enum_close): Removed.
	(gpgme_op_encrypt, gpgme_op_encrypt_start, gpgme_op_encrypt_sign,
	gpgme_op_encrypt_sign_start, gpgme_op_export_start,
	gpgme_op_export): Change second argument to gpgme_user_id_t.
	(gpgme_user_ids_release): New prototype.
	(gpgme_user_ids_append): Likewise.
	* ops.h (_gpgme_recipients_all_valid): Remove.
	(_gpgme_user_ids_all_valid): Add.
	* context.h (struct gpgme_recipients): Removed.
	* user-id.c: New file.
	* recipient.c: Removed file.
	* rungpg.c (append_args_from_recipients): Change last arg to
	gpgme_user_id_t.  Reimplement.
	(gpg_encrypt): Change second arg to gpgme_user_id_t.
	(gpg_encrypt_sign): Likewise.
	(gpg_export): Likewise.  Rewrite user ID list code.
	* engine.c (_gpgme_engine_op_encrypt): Change second arg to
	gpgme_user_id_t.
	(_gpgme_engine_op_encrypt_sign): Likewise.
	(_gpgme_engine_op_export): Likewise.
	* engine.h (_gpgme_engine_op_encrypt, _gpgme_engine_op_encrypt_sign,
	_gpgme_engine_op_export): Likewise.
	* engine-gpgsm.c (set_recipients): Likewise.  Rewrite loop code.
	(gpgsm_encrypt): Likewise.
	(gpgsm_export): Likewise.
	* engine-backend.h (struct engine_ops): Likewise for members
	ENCRYPT, ENCRYPT_SIGN and EXPORT.
	* export.c (export_start, gpgme_op_export_start, gpgme_op_export):
	Likewise.
	* encrypt.c (encrypt_start): Likewise.  Don't check for count of
	recipients.
	(gpgme_op_encrypt_start): Likewise.
	(gpgme_op_encrypt): Likewise.
	* encrypt-sign.c (encrypt_sign_start): Likewise.
	(gpgme_op_encrypt_sign): Likewise.
	(gpgme_op_encrypt_sign_start): Likewise.

tests/
2003-05-28  Marcus Brinkmann  <[email protected]>

	* gpg/t-eventloop.c (main): Rewrite recipient management.
	* gpg/t-encrypt-sign.c (main): Likewise.
	* gpg/t-encrypt.c (main): Likewise.
	* gpg/t-export.c (main): Likewise.

5 files changed, 142 insertions, 125 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 883ec7fa..35d02861 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-28  Marcus Brinkmann  <[email protected]>
+
+	* gpg/t-eventloop.c (main): Rewrite recipient management.
+	* gpg/t-encrypt-sign.c (main): Likewise.
+	* gpg/t-encrypt.c (main): Likewise.
+	* gpg/t-export.c (main): Likewise.
+	
 2003-05-27  Marcus Brinkmann  <[email protected]>
 
 	* gpg/Makefile.am (TESTS): Order t-keylist and t-keylist-sig after
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index 7e8fc3f9..8dd8235d 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -117,7 +117,8 @@ main (int argc, char **argv)
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_recipients_t rset;
+  gpgme_user_id_t rset = NULL;
+  gpgme_user_id_t *rset_lastp = &rset;
   gpgme_encrypt_result_t result;
   gpgme_sign_result_t sign_result;
   char *agent_info;
@@ -139,15 +140,15 @@ main (int argc, char **argv)
 
   err = gpgme_data_new (&out);
   fail_if_err (err);
-    
-  err = gpgme_recipients_new (&rset);
-  fail_if_err (err);
-  err = gpgme_recipients_add_name_with_validity (rset, "Bob",
-						 GPGME_VALIDITY_FULL);
+
+  err = gpgme_user_ids_append (rset_lastp, "Alpha");
   fail_if_err (err);
-  err = gpgme_recipients_add_name_with_validity (rset, "Alpha",
-						 GPGME_VALIDITY_FULL);
+  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
+
+  rset_lastp = &(*rset_lastp)->next;
+  err = gpgme_user_ids_append (rset_lastp, "Bob");
   fail_if_err (err);
+  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
 
   err = gpgme_op_encrypt_sign (ctx, rset, in, out);
   fail_if_err (err);
@@ -162,11 +163,9 @@ main (int argc, char **argv)
   check_result (sign_result, GPGME_SIG_MODE_NORMAL);
   print_data (out);
 
-  gpgme_recipients_release (rset);
+  gpgme_user_ids_release (rset);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
   return 0;
 }
-
-
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 1bd7bbf6..0e41eb37 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -60,7 +60,8 @@ main (int argc, char **argv)
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_recipients_t rset;
+  gpgme_user_id_t rset = NULL;
+  gpgme_user_id_t *rset_lastp = &rset;
   gpgme_encrypt_result_t result;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
@@ -76,14 +77,14 @@ main (int argc, char **argv)
   err = gpgme_data_new (&out);
   fail_if_err (err);
     
-  err = gpgme_recipients_new (&rset);
+  err = gpgme_user_ids_append (rset_lastp, "Alpha");
   fail_if_err (err);
-  err = gpgme_recipients_add_name_with_validity (rset, "Bob",
-						 GPGME_VALIDITY_FULL);
-  fail_if_err (err);
-  err = gpgme_recipients_add_name_with_validity (rset, "Alpha",
-						 GPGME_VALIDITY_FULL);
+  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
+
+  rset_lastp = &(*rset_lastp)->next;
+  err = gpgme_user_ids_append (rset_lastp, "Bob");
   fail_if_err (err);
+  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
 
   err = gpgme_op_encrypt (ctx, rset, in, out);
   fail_if_err (err);
@@ -96,7 +97,7 @@ main (int argc, char **argv)
     }
   print_data (out);
 
-  gpgme_recipients_release (rset);
+  gpgme_user_ids_release (rset);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 66dce7fc..597da1c1 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -27,11 +27,18 @@
 
 #include <gpgme.h>
 
-#define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
-                                __FILE__, __LINE__, gpgme_strerror(a));   \
-                                exit (1); }                               \
-                             } while(0)
+#define fail_if_err(err)					\
+  do								\
+    {								\
+      if (err)							\
+        {							\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
+                   __FILE__, __LINE__, gpgme_strerror (err));   \
+          exit (1);						\
+        }							\
+    }								\
+  while (0)
+
 
 static void
 print_data (gpgme_data_t dh)
@@ -114,6 +121,7 @@ io_event (void *data, gpgme_event_io_t type, void *type_data)
     }
 }
 
+
 int
 do_select (void)
 {
@@ -166,6 +174,7 @@ my_wait (void)
   return 0;
 }
 
+
 struct gpgme_io_cbs io_cbs =
   {
     add_io_cb,
@@ -175,13 +184,15 @@ struct gpgme_io_cbs io_cbs =
     &op_result
   };
 
+
 int 
 main (int argc, char *argv[])
 {
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_recipients_t rset;
+  gpgme_user_id_t rset = NULL;
+  gpgme_user_id_t *rset_lastp = &rset;
   int i;
 
   for (i = 0; i < FDLIST_MAX; i++)
@@ -190,49 +201,43 @@ main (int argc, char *argv[])
   err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
   fail_if_err (err);
 
-  do
-    {
-      err = gpgme_new (&ctx);
-      fail_if_err (err);
-      gpgme_set_armor (ctx, 1);
-      gpgme_set_io_cbs (ctx, &io_cbs);
-      op_result.done = 0;
-
-      err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0);
-      fail_if_err (err);
-
-      err = gpgme_data_new (&out);
-      fail_if_err (err);
-
-      err = gpgme_recipients_new (&rset);
-      fail_if_err (err);
-      err = gpgme_recipients_add_name_with_validity (rset, "Bob",
-						     GPGME_VALIDITY_FULL);
-      fail_if_err (err);
-      err = gpgme_recipients_add_name_with_validity (rset, "Alpha",
-						     GPGME_VALIDITY_FULL);
-      fail_if_err (err);
-
-      err = gpgme_op_encrypt_start (ctx, rset, in, out);
-      fail_if_err (err);
-
-      my_wait ();
-      fail_if_err (op_result.err);
-      fail_if_err (err);
-
-      fflush (NULL);
-      fputs ("Begin Result:\n", stdout);
-      print_data (out);
-      fputs ("End Result.\n", stdout);
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_armor (ctx, 1);
+  gpgme_set_io_cbs (ctx, &io_cbs);
+  op_result.done = 0;
+
+  err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0);
+  fail_if_err (err);
+
+  err = gpgme_data_new (&out);
+  fail_if_err (err);
+
+  err = gpgme_user_ids_append (rset_lastp, "Alpha");
+  fail_if_err (err);
+  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
+
+  rset_lastp = &(*rset_lastp)->next;
+  err = gpgme_user_ids_append (rset_lastp, "Bob");
+  fail_if_err (err);
+  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
+
+  err = gpgme_op_encrypt_start (ctx, rset, in, out);
+  fail_if_err (err);
+
+  my_wait ();
+  fail_if_err (op_result.err);
+  fail_if_err (err);
+
+  fflush (NULL);
+  fputs ("Begin Result:\n", stdout);
+  print_data (out);
+  fputs ("End Result.\n", stdout);
    
-      gpgme_recipients_release (rset);
-      gpgme_data_release (in);
-      gpgme_data_release (out);
-      gpgme_release (ctx);
-    }
-  while (argc > 1 && !strcmp (argv[1], "--loop"));
+  gpgme_user_ids_release (rset);
+  gpgme_data_release (in);
+  gpgme_data_release (out);
+  gpgme_release (ctx);
 
   return 0;
 }
-
-
diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index 520a3d33..d36dbb2b 100644
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -1,23 +1,22 @@
-/* t-export.c  - regression test
- *	Copyright (C) 2000 Werner Koch (dd9jn)
- *      Copyright (C) 2001 g10 Code GmbH
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+/* t-export.c - Regression test.
+   Copyright (C) 2000 Werner Koch (dd9jn)
+   Copyright (C) 2001, 2003 g10 Code GmbH
+
+   This file is part of GPGME.
+ 
+   GPGME is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+ 
+   GPGME is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with GPGME; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,11 +25,17 @@
 
 #include <gpgme.h>
 
-#define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
-                                __FILE__, __LINE__, gpgme_strerror(a));   \
-                                exit (1); }                               \
-                             } while(0)
+#define fail_if_err(err)					\
+  do								\
+    {								\
+      if (err)							\
+        {							\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
+                   __FILE__, __LINE__, gpgme_strerror (err));   \
+          exit (1);						\
+        }							\
+    }								\
+  while (0)
 
 
 static void
@@ -48,43 +53,43 @@ print_data (gpgme_data_t dh)
     fail_if_err (GPGME_File_Error);
 }
 
+
 int 
-main (int argc, char **argv )
+main (int argc, char **argv)
 {
-    gpgme_ctx_t ctx;
-    gpgme_error_t err;
-    gpgme_data_t  out;
-    gpgme_recipients_t rset;
-
-  do {
-    err = gpgme_new (&ctx);
-    fail_if_err (err);
-
-    err = gpgme_data_new ( &out );
-    fail_if_err (err);
-
-    err = gpgme_recipients_new (&rset);
-    fail_if_err (err);
-    err = gpgme_recipients_add_name (rset, "Bob");
-    fail_if_err (err);
-    err = gpgme_recipients_add_name (rset, "Alpha");
-    fail_if_err (err);
-
-    gpgme_set_armor (ctx, 1 );
-    err = gpgme_op_export (ctx, rset, out );
-    fail_if_err (err);
-
-    fflush (NULL);
-    fputs ("Begin Result:\n", stdout );
-    print_data (out);
-    fputs ("End Result.\n", stdout );
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t  out;
+  gpgme_user_id_t uids = NULL;
+  gpgme_user_id_t *uids_lastp = &uids;
+
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+
+  err = gpgme_data_new (&out);
+  fail_if_err (err);
+
+  err = gpgme_user_ids_append (uids_lastp, "Alpha");
+  fail_if_err (err);
+  uids_lastp = &(*uids_lastp)->next;
+
+  err = gpgme_user_ids_append (uids_lastp, "Bob");
+  fail_if_err (err);
+
+  gpgme_set_armor (ctx, 1);
+  err = gpgme_op_export (ctx, uids, out);
+  fail_if_err (err);
+
+  fflush (NULL);
+  fputs ("Begin Result:\n", stdout);
+  print_data (out);
+  fputs ("End Result.\n", stdout);
    
-    gpgme_recipients_release (rset);
-    gpgme_data_release (out);
-    gpgme_release (ctx);
-  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) );
+  gpgme_user_ids_release (uids);
+  gpgme_data_release (out);
+  gpgme_release (ctx);
    
-    return 0;
+  return 0;
 }