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. --- gpgme/encrypt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gpgme/encrypt.c') diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c index 4873aaa5..841d66ec 100644 --- a/gpgme/encrypt.c +++ b/gpgme/encrypt.c @@ -148,7 +148,7 @@ _gpgme_op_encrypt_init_result (gpgme_ctx_t ctx) static gpgme_error_t -encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp, +encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_user_id_t recp, gpgme_data_t plain, gpgme_data_t cipher) { gpgme_error_t err; @@ -164,8 +164,6 @@ encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp, if (!recp) symmetric = 1; - else if (gpgme_recipients_count (recp) == 0) - return GPGME_No_UserID; if (!plain) return GPGME_No_Data; @@ -193,7 +191,7 @@ encrypt_start (gpgme_ctx_t ctx, int synchronous, gpgme_recipients_t recp, gpgme_error_t -gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_recipients_t recp, +gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_user_id_t recp, gpgme_data_t plain, gpgme_data_t cipher) { return encrypt_start (ctx, 0, recp, plain, cipher); @@ -203,7 +201,7 @@ gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_recipients_t recp, /* Encrypt plaintext PLAIN within CTX for the recipients RECP and store the resulting ciphertext in CIPHER. */ gpgme_error_t -gpgme_op_encrypt (gpgme_ctx_t ctx, gpgme_recipients_t recp, +gpgme_op_encrypt (gpgme_ctx_t ctx, gpgme_user_id_t recp, gpgme_data_t plain, gpgme_data_t cipher) { gpgme_error_t err = encrypt_start (ctx, 1, recp, plain, cipher); -- cgit v1.2.3