
2003-05-28 Marcus Brinkmann <marcus@g10code.de> * 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 <marcus@g10code.de> * 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 <marcus@g10code.de> * 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.
92 lines
2.2 KiB
C
92 lines
2.2 KiB
C
/* signers.c - Maintain signer sets.
|
||
Copyright (C) 2001 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 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. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
#include <assert.h>
|
||
|
||
#include "util.h"
|
||
#include "context.h"
|
||
|
||
|
||
/* Delete all signers from CTX. */
|
||
void
|
||
gpgme_signers_clear (gpgme_ctx_t ctx)
|
||
{
|
||
int i;
|
||
|
||
if (!ctx || !ctx->signers)
|
||
return;
|
||
|
||
for (i = 0; i < ctx->signers_len; i++)
|
||
{
|
||
assert (ctx->signers[i]);
|
||
gpgme_key_unref (ctx->signers[i]);
|
||
ctx->signers[i] = NULL;
|
||
}
|
||
ctx->signers_len = 0;
|
||
}
|
||
|
||
/* Add KEY to list of signers in CTX. */
|
||
gpgme_error_t
|
||
gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key)
|
||
{
|
||
if (!ctx || !key)
|
||
return GPGME_Invalid_Value;
|
||
|
||
if (ctx->signers_len == ctx->signers_size)
|
||
{
|
||
gpgme_key_t *newarr;
|
||
int n = ctx->signers_size + 5;
|
||
int j;
|
||
|
||
newarr = realloc (ctx->signers, n * sizeof (*newarr));
|
||
if (!newarr)
|
||
return GPGME_Out_Of_Core;
|
||
for (j = ctx->signers_size; j < n; j++)
|
||
newarr[j] = NULL;
|
||
ctx->signers = newarr;
|
||
ctx->signers_size = n;
|
||
}
|
||
|
||
gpgme_key_ref (key);
|
||
ctx->signers[ctx->signers_len++] = key;
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Return the SEQth signer's key in CTX with one reference. */
|
||
gpgme_key_t
|
||
gpgme_signers_enum (const gpgme_ctx_t ctx, int seq)
|
||
{
|
||
if (!ctx || seq < 0)
|
||
return NULL;
|
||
|
||
if (seq >= ctx->signers_len)
|
||
return NULL;
|
||
|
||
gpgme_key_ref (ctx->signers[seq]);
|
||
return ctx->signers[seq];
|
||
}
|