From bade4a32b525c3e84cd6a74f1e8d2364322b8526 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 28 May 2003 01:15:38 +0000 Subject: doc/ 2003-05-28 Marcus Brinkmann * 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 * 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 * 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. --- tests/gpg/t-encrypt-sign.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'tests/gpg/t-encrypt-sign.c') 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; } - - -- cgit v1.2.3