8f8c78d534
2003-05-29 Marcus Brinkmann <marcus@g10code.de> * 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 <marcus@g10code.de> * 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 <marcus@g10code.de> * 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.
242 lines
4.7 KiB
C
242 lines
4.7 KiB
C
/* t-eventloop.c - regression test
|
|
Copyright (C) 2000 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. */
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <sys/select.h>
|
|
|
|
#include <gpgme.h>
|
|
|
|
#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)
|
|
{
|
|
char buf[100];
|
|
int ret;
|
|
|
|
ret = gpgme_data_seek (dh, 0, SEEK_SET);
|
|
if (ret)
|
|
fail_if_err (GPGME_File_Error);
|
|
while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
|
|
fwrite (buf, ret, 1, stdout);
|
|
if (ret < 0)
|
|
fail_if_err (GPGME_File_Error);
|
|
}
|
|
|
|
|
|
/* Stripped down version of gpgme/wait.c. */
|
|
|
|
struct op_result
|
|
{
|
|
int done;
|
|
gpgme_error_t err;
|
|
};
|
|
|
|
struct op_result op_result;
|
|
|
|
struct one_fd
|
|
{
|
|
int fd;
|
|
int dir;
|
|
gpgme_io_cb_t fnc;
|
|
void *fnc_data;
|
|
};
|
|
|
|
#define FDLIST_MAX 32
|
|
struct one_fd fdlist[FDLIST_MAX];
|
|
|
|
gpgme_error_t
|
|
add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data,
|
|
void **r_tag)
|
|
{
|
|
struct one_fd *fds = data;
|
|
int i;
|
|
|
|
for (i = 0; i < FDLIST_MAX; i++)
|
|
{
|
|
if (fds[i].fd == -1)
|
|
{
|
|
fds[i].fd = fd;
|
|
fds[i].dir = dir;
|
|
fds[i].fnc = fnc;
|
|
fds[i].fnc_data = fnc_data;
|
|
break;
|
|
}
|
|
}
|
|
if (i == FDLIST_MAX)
|
|
return GPGME_General_Error;
|
|
*r_tag = &fds[i];
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
remove_io_cb (void *tag)
|
|
{
|
|
struct one_fd *fd = tag;
|
|
|
|
fd->fd = -1;
|
|
}
|
|
|
|
void
|
|
io_event (void *data, gpgme_event_io_t type, void *type_data)
|
|
{
|
|
struct op_result *result = data;
|
|
|
|
if (type == GPGME_EVENT_DONE)
|
|
{
|
|
result->done = 1;
|
|
result->err = * (gpgme_error_t *) type_data;
|
|
}
|
|
}
|
|
|
|
|
|
int
|
|
do_select (void)
|
|
{
|
|
fd_set rfds;
|
|
fd_set wfds;
|
|
int i, n;
|
|
int any = 0;
|
|
|
|
FD_ZERO (&rfds);
|
|
FD_ZERO (&wfds);
|
|
for (i = 0; i < FDLIST_MAX; i++)
|
|
if (fdlist[i].fd != -1)
|
|
FD_SET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds);
|
|
|
|
do
|
|
{
|
|
n = select (FD_SETSIZE, &rfds, &wfds, NULL, 0);
|
|
}
|
|
while (n < 0 && errno == EINTR);
|
|
|
|
if (n < 0)
|
|
return n; /* Error or timeout. */
|
|
|
|
for (i = 0; i < FDLIST_MAX && n; i++)
|
|
{
|
|
if (fdlist[i].fd != -1)
|
|
{
|
|
if (FD_ISSET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds))
|
|
{
|
|
assert (n);
|
|
n--;
|
|
any = 1;
|
|
(*fdlist[i].fnc) (fdlist[i].fnc_data, fdlist[i].fd);
|
|
}
|
|
}
|
|
}
|
|
return any;
|
|
}
|
|
|
|
int
|
|
my_wait (void)
|
|
{
|
|
int n;
|
|
|
|
do
|
|
{
|
|
n = do_select ();
|
|
}
|
|
while (n >= 0 && !op_result.done);
|
|
return 0;
|
|
}
|
|
|
|
|
|
struct gpgme_io_cbs io_cbs =
|
|
{
|
|
add_io_cb,
|
|
fdlist,
|
|
remove_io_cb,
|
|
io_event,
|
|
&op_result
|
|
};
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
gpgme_ctx_t ctx;
|
|
gpgme_error_t err;
|
|
gpgme_data_t in, out;
|
|
gpgme_key_t key[3] = { NULL, NULL, NULL };
|
|
int i;
|
|
|
|
for (i = 0; i < FDLIST_MAX; i++)
|
|
fdlist[i].fd = -1;
|
|
|
|
err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
|
|
fail_if_err (err);
|
|
|
|
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_get_key (ctx, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
|
|
&key[0], 0);
|
|
fail_if_err (err);
|
|
err = gpgme_get_key (ctx, "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2",
|
|
&key[1], 0);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_op_encrypt_start (ctx, key, GPGME_ENCRYPT_ALWAYS_TRUST, 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_key_unref (key[0]);
|
|
gpgme_key_unref (key[1]);
|
|
gpgme_data_release (in);
|
|
gpgme_data_release (out);
|
|
gpgme_release (ctx);
|
|
|
|
return 0;
|
|
}
|