doc/

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

	* gpgme.texi (Exporting Keys): Change and document prototypes.
	Add new gpgme_op_export_ext and gpgme_op_export_ext_start
	variants.
	(Selecting Recipients): Section removed.
	(Encrypting a Plaintext): Change prototypes and document the
	changes.

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

	* gpgme.h (gpgme_op_export_start): Change second arg to const char *.
	(gpgme_op_export): Likewise.
	(gpgme_op_export_ext_start): New prototype.
	(gpgme_op_export_ext): Likewise.
	* engine.h: Likewise for _gpgme_engine_op_export and
	_gpgme_engine_op_export_ext.
	* engine-backend.h (struct engine_ops): Change second argument of
	prototype of export to const char *, and add reserverd int as
	third argument.  Add prototype for export_ext.
	* engine.c (_gpgme_engine_op_export_ext): New function.
	(_gpgme_engine_op_export): Change second argument of prototype of
	export to const char *, and add reserverd int as third argument.
	* rungpg.c (gpg_export): Change second argument of prototype of
	export to const char *, and add reserverd int as third argument.
	(gpg_export_ext): New function.
	(gpg_keylist_ext): Break loop at error.
	(_gpgme_engine_ops_gpg): Add gpg_export_ext.
	* engine-gpgsm.c (gpgsm_export): Change second argument of
	prototype of export to const char *, and add reserverd int as
	third argument.
	(gpgsm_export_ext): New function.
	(_gpgme_engine_ops_gpgsm): Add gpgsm_export_ext.
	* export.c (export_start): Change second argument of prototype of
	export to const char *, and add reserverd int as third argument.
	(gpgme_op_export_start): Likewise.
	(export_ext_start): New function.
	(gpgme_op_export_ext_start): Likewise.
	(gpgme_op_export_ext): Likewise.

	* gpgme.h (gpgme_keylist_mode_t): New type for anonymous enum.
	(gpgme_sigsum_t): New type for anonymous enum.

	* encrypt-sign.c (encrypt_sign_start): Check for errors earlier,
	and return an error if RECP is not set.

	* Makefile.am (libgpgme_la_SOURCES): Remove user-id.c.
	* user-id.c: Remove file.
	* ops.h: Remove prototype for _gpgme_user_ids_all_valid.
	* gpgme.h (gpgme_encrypt_flags_t): New type.
	(gpgme_op_encrypt_start): Change second parameter to type
	gpgme_key_t[], and add third parameter.
	(gpgme_op_encrypt): Likewise.
	(gpgme_op_encrypt_sign_start): Likewise.
	(gpgme_op_encrypt_sign): Likewise.
	* encrypt.c (encrypt_start): Likewise.
	(gpgme_op_encrypt_start): Likewise.
	(gpgme_op_encrypt): Likewise.  Pass flags to engine.
	* encrypt-sign.c (encrypt_sign_start): Likewise.
	(gpgme_op_encrypt_sign_start): Likewise.
	(gpgme_op_encrypt_sign): Likewise.
	* engine-backend.h (struct engine_ops): Likewise for prototypes of
	encrypt and encrypt_sign.
	* engine.h: Likewise for prototypes of _gpgme_engine_op_encrypt
	and _gpgme_engine_op_encrypt_sign.
	* engine.c (_gpgme_engine_op_encrypt): Likewise.
	(_gpgme_engine_op_encrypt_sign): Likewise.
	* rungpg.c (gpg_encrypt): Likewise.
	(gpg_encrypt_sign): Likewise.
	* rungpg.c (gpg_encrypt): Check flags for always trust option.
	* engine-gpgsm.c (gpgsm_encrypt): Likewise.
	(set_recipients): Rewritten to use keys instead user IDs.
	* rungpg.c (append_args_from_recipients): Rewritten to use keys
	instead user IDs.
	* encrypt.c (_gpgme_encrypt_status_handler): Change errors
	returned to GPGME_Invalid_Key and GPGME_General_Error.

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

	* gpg/t-encrypt-sym.c (main): Adapt to new syntax.
	* gpg/t-encrypt.c (main): Likewise.
	* gpg/t-eventloop.c (main): Likewise.
	* gpg/t-encrypt-sign.c (main): Likewise.
	* gpgsm/t-export.c (main): Likewise.
	* gpgsm/t-encrypt.c (main): Likewise.

8 files changed, 109 insertions, 120 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6191e5e8..0d45e9ff 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-29  Marcus Brinkmann  <[email protected]>
+
+	* gpg/t-encrypt-sym.c (main): Adapt to new syntax.
+	* gpg/t-encrypt.c (main): Likewise.
+	* gpg/t-eventloop.c (main): Likewise.
+	* gpg/t-encrypt-sign.c (main): Likewise.
+	* gpgsm/t-export.c (main): Likewise.
+	* gpgsm/t-encrypt.c (main): Likewise.
+
 2003-05-28  Marcus Brinkmann  <[email protected]>
 
 	* gpg/t-eventloop.c (main): Rewrite recipient management.
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index 8dd8235d..40a654be 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -117,8 +117,7 @@ main (int argc, char **argv)
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_user_id_t rset = NULL;
-  gpgme_user_id_t *rset_lastp = &rset;
+  gpgme_key_t key[3] = { NULL, NULL, NULL };
   gpgme_encrypt_result_t result;
   gpgme_sign_result_t sign_result;
   char *agent_info;
@@ -141,16 +140,14 @@ main (int argc, char **argv)
   err = gpgme_data_new (&out);
   fail_if_err (err);
 
-  err = gpgme_user_ids_append (rset_lastp, "Alpha");
+  err = gpgme_get_key (ctx, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+		       &key[0], 0);
   fail_if_err (err);
-  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
-
-  rset_lastp = &(*rset_lastp)->next;
-  err = gpgme_user_ids_append (rset_lastp, "Bob");
+  err = gpgme_get_key (ctx, "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2",
+		       &key[1], 0);
   fail_if_err (err);
-  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
 
-  err = gpgme_op_encrypt_sign (ctx, rset, in, out);
+  err = gpgme_op_encrypt_sign (ctx, key, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
   fail_if_err (err);
   result = gpgme_op_encrypt_result (ctx);
   if (result->invalid_recipients)
@@ -163,7 +160,8 @@ main (int argc, char **argv)
   check_result (sign_result, GPGME_SIG_MODE_NORMAL);
   print_data (out);
 
-  gpgme_user_ids_release (rset);
+  gpgme_key_unref (key[0]);
+  gpgme_key_unref (key[1]);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 5adc31c4..41fe3085 100644
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -1,23 +1,22 @@
 /* t-encrypt-sym.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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+   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>
@@ -27,11 +26,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)
@@ -72,54 +78,50 @@ 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);
-
-      p = getenv("GPG_AGENT_INFO");
-      if (!(p && strchr (p, ':')))
-        gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_armor (ctx, 1);
 
-      err = gpgme_data_new_from_mem (&plain, text, strlen (text), 0);
-      fail_if_err (err);
+  p = getenv("GPG_AGENT_INFO");
+  if (!(p && strchr (p, ':')))
+    gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
 
-      err = gpgme_data_new (&cipher);
-      fail_if_err (err);
+  err = gpgme_data_new_from_mem (&plain, text, strlen (text), 0);
+  fail_if_err (err);
 
-      err = gpgme_op_encrypt (ctx, 0, plain, cipher);
-      fail_if_err (err);
+  err = gpgme_data_new (&cipher);
+  fail_if_err (err);
 
-      fflush (NULL);
-      fputs ("Begin Result Encryption:\n", stdout);
-      print_data (cipher);
-      fputs ("End Result.\n", stdout);
+  err = gpgme_op_encrypt (ctx, 0, 0, plain, cipher);
+  fail_if_err (err);
 
-      gpgme_data_seek (cipher, 0, SEEK_SET);
+  fflush (NULL);
+  fputs ("Begin Result Encryption:\n", stdout);
+  print_data (cipher);
+  fputs ("End Result.\n", stdout);
 
-      gpgme_data_release (plain);
-      err = gpgme_data_new (&plain);
-      fail_if_err (err);
+  gpgme_data_seek (cipher, 0, SEEK_SET);
 
-      err = gpgme_op_decrypt (ctx, cipher, plain);
-      fail_if_err (err);
+  gpgme_data_release (plain);
+  err = gpgme_data_new (&plain);
+  fail_if_err (err);
 
-      fputs ("Begin Result Decryption:\n", stdout);
-      print_data (plain);
-      fputs ("End Result.\n", stdout);
+  err = gpgme_op_decrypt (ctx, cipher, plain);
+  fail_if_err (err);
 
-      text2 = gpgme_data_release_and_get_mem (plain, &len);
-      if (strncmp (text, text2, len))
-	{
-	  fprintf (stderr, "%s:%d: Wrong plaintext\n", __FILE__, __LINE__);
-	  exit (1);
-	}
+  fputs ("Begin Result Decryption:\n", stdout);
+  print_data (plain);
+  fputs ("End Result.\n", stdout);
 
-      gpgme_data_release (cipher);
-      gpgme_release (ctx);
+  text2 = gpgme_data_release_and_get_mem (plain, &len);
+  if (strncmp (text, text2, len))
+    {
+      fprintf (stderr, "%s:%d: Wrong plaintext\n", __FILE__, __LINE__);
+      exit (1);
     }
-  while (argc > 1 && !strcmp (argv[1], "--loop"));
+
+  gpgme_data_release (cipher);
+  gpgme_release (ctx);
 
   return 0;
 }
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 0e41eb37..1373a397 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -60,10 +60,11 @@ main (int argc, char **argv)
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_user_id_t rset = NULL;
-  gpgme_user_id_t *rset_lastp = &rset;
+  gpgme_key_t key[3] = { NULL, NULL, NULL };
   gpgme_encrypt_result_t result;
 
+  gpgme_check_version (0);
+
   err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
   fail_if_err (err);
     
@@ -76,17 +77,15 @@ main (int argc, char **argv)
 
   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");
+  err = gpgme_get_key (ctx, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+		       &key[0], 0);
+  fail_if_err (err);
+  err = gpgme_get_key (ctx, "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2",
+		       &key[1], 0);
   fail_if_err (err);
-  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
 
-  err = gpgme_op_encrypt (ctx, rset, in, out);
+  err = gpgme_op_encrypt (ctx, key, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
   fail_if_err (err);
   result = gpgme_op_encrypt_result (ctx);
   if (result->invalid_recipients)
@@ -97,11 +96,10 @@ main (int argc, char **argv)
     }
   print_data (out);
 
-  gpgme_user_ids_release (rset);
+  gpgme_key_unref (key[0]);
+  gpgme_key_unref (key[1]);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
   return 0;
 }
-
-
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 597da1c1..990876d7 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -191,8 +191,7 @@ main (int argc, char *argv[])
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_user_id_t rset = NULL;
-  gpgme_user_id_t *rset_lastp = &rset;
+  gpgme_key_t key[3] = { NULL, NULL, NULL };
   int i;
 
   for (i = 0; i < FDLIST_MAX; i++)
@@ -213,16 +212,14 @@ main (int argc, char *argv[])
   err = gpgme_data_new (&out);
   fail_if_err (err);
 
-  err = gpgme_user_ids_append (rset_lastp, "Alpha");
+  err = gpgme_get_key (ctx, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
+		       &key[0], 0);
   fail_if_err (err);
-  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
-
-  rset_lastp = &(*rset_lastp)->next;
-  err = gpgme_user_ids_append (rset_lastp, "Bob");
+  err = gpgme_get_key (ctx, "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2",
+		       &key[1], 0);
   fail_if_err (err);
-  (*rset_lastp)->validity = GPGME_VALIDITY_FULL;
 
-  err = gpgme_op_encrypt_start (ctx, rset, in, out);
+  err = gpgme_op_encrypt_start (ctx, key, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
   fail_if_err (err);
 
   my_wait ();
@@ -234,7 +231,8 @@ main (int argc, char *argv[])
   print_data (out);
   fputs ("End Result.\n", stdout);
    
-  gpgme_user_ids_release (rset);
+  gpgme_key_unref (key[0]);
+  gpgme_key_unref (key[1]);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index d36dbb2b..7ec69e6f 100644
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -60,8 +60,7 @@ main (int argc, char **argv)
   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;
+  const char *pattern[] = { "Alpha", "Bob", NULL };
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -69,15 +68,8 @@ main (int argc, char **argv)
   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);
+  err = gpgme_op_export_ext (ctx, pattern, 0, out);
   fail_if_err (err);
 
   fflush (NULL);
@@ -85,11 +77,8 @@ main (int argc, char **argv)
   print_data (out);
   fputs ("End Result.\n", stdout);
    
-  gpgme_user_ids_release (uids);
   gpgme_data_release (out);
   gpgme_release (ctx);
    
   return 0;
 }
-
-
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 510eda5d..5f8916f7 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -60,7 +60,7 @@ main (int argc, char **argv)
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_user_id_t rset = NULL;
+  gpgme_key_t key[] = { NULL, NULL };
   gpgme_encrypt_result_t result;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
@@ -77,11 +77,11 @@ main (int argc, char **argv)
   err = gpgme_data_new (&out);
   fail_if_err (err);
     
-  err = gpgme_user_ids_append (&rset, "test cert 1");
+  err = gpgme_get_key (ctx, "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
+		       &key[0], 0);
   fail_if_err (err);
-  rset->validity = GPGME_VALIDITY_FULL;
 
-  err = gpgme_op_encrypt (ctx, rset, in, out);
+  err = gpgme_op_encrypt (ctx, key, 0, in, out);
   fail_if_err (err);
   result = gpgme_op_encrypt_result (ctx);
   if (result->invalid_recipients)
@@ -92,7 +92,7 @@ main (int argc, char **argv)
     }
   print_data (out);
 
-  gpgme_user_ids_release (rset);
+  gpgme_key_unref (key[0]);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index fde58b24..3d536ad4 100644
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -59,9 +59,8 @@ main (int argc, char *argv[])
 {
   gpgme_ctx_t ctx;
   gpgme_error_t err;
-  gpgme_data_t  out;
-  gpgme_user_id_t rset = NULL;
-
+  gpgme_data_t out;
+  const char *pattern[] = { "DFN Top Level Certification Authority", NULL };
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
@@ -69,11 +68,8 @@ main (int argc, char *argv[])
   err = gpgme_data_new (&out);
   fail_if_err (err);
 
-  err = gpgme_user_ids_append (&rset, "DFN Top Level Certification Authority");
-  fail_if_err (err);
-
   gpgme_set_armor (ctx, 1);
-  err = gpgme_op_export (ctx, rset, out);
+  err = gpgme_op_export_ext (ctx, pattern, 0, out);
   fail_if_err (err);
 
   fflush (NULL);
@@ -81,7 +77,6 @@ main (int argc, char *argv[])
   print_data (out);
   fputs ("End Result.\n", stdout);
 
-  gpgme_user_ids_release (rset);
   gpgme_data_release (out);
   gpgme_release (ctx);