2002-07-03 02:18:43 +00:00
|
|
|
/* t-eventloop.c - regression test
|
2003-01-30 11:54:23 +00:00
|
|
|
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. */
|
2002-07-03 02:18:43 +00:00
|
|
|
|
|
|
|
#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(a) do { if(a) { \
|
2003-05-18 20:45:24 +00:00
|
|
|
fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
|
2002-07-03 02:18:43 +00:00
|
|
|
__FILE__, __LINE__, gpgme_strerror(a)); \
|
|
|
|
exit (1); } \
|
|
|
|
} while(0)
|
|
|
|
|
|
|
|
static void
|
2003-05-18 20:45:24 +00:00
|
|
|
print_data (gpgme_data_t dh)
|
2002-07-03 02:18:43 +00:00
|
|
|
{
|
|
|
|
char buf[100];
|
gpgme/
2002-10-08 Marcus Brinkmann <marcus@g10code.de>
New data object component:
* gpgme.h (GpgmeDataReadCb, GpgmeDataWriteCb, GpgmeDataSeekCb,
GpgmeDataReleaseCb): New types.
(struct GpgmeDataCbs): New structure.
(gpgme_data_read): Changed prototype to match that of read() closely.
(gpgme_data_write): Similar for write().
(gpgme_data_seek, gpgme_data_new_from_cbs, gpgme_data_new_from_fd,
gpgme_data_new_from_stream): New prototypes.
(gpgme_data_get_type, gpgme_check_engine): Prototype removed.
* Makefile.am (libgpgme_la_SOURCES): Add data.h, data-fd.c,
data-stream.c, data-mem.c, data-user.c and data-compat.c.
* data.c: Reimplemented from scratch.
* (data-compat.c, data-fd.c, data.h, data-mem.c, data-stream.c,
data-user.c): New file.
* context.h (struct gpgme_data_s): Removed.
* conversion.c: Include <errno.h> and <sys/types.h>.
(_gpgme_data_append): New function.
* data.c (_gpgme_data_append_string): Move to ...
* conversion.c (_gpgme_data_append_string): ... here.
* data.c (_gpgme_data_append_for_xml): Move to ...
* conversion.c (_gpgme_data_append_for_xml): ... here.
* data.c (_gpgme_data_append_string_for_xml): Move to ...
* conversion.c (_gpgme_data_append_string_for_xml): ... here.
* data.c (_gpgme_data_append_percentstring_for_xml): Move to ...
* conversion.c (_gpgme_data_append_percentstring_for_xml): ... here.
* ops.h (_gpgme_data_get_mode, _gpgme_data_set_mode): Prototype
removed.
* types.h (GpgmeDataMode): Type removed.
* decrypt.c (_gpgme_decrypt_start): Don't check data type or mode.
* edit.c (_gpgme_op_edit_start): Likewise.
* encrypt.c (_gpgme_op_encrypt_start): Likewise.
* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
* export.c (_gpgme_op_export_start): Likewise.
* genkey.c (_gpgme_op_genkey_start): Likewise.
* import.c (_gpgme_op_import_start): Likewise.
* sign.c (_gpgme_op_sign_start): Likewise.
* verify.c (_gpgme_op_verify_start): Likewise.
* encrypt.c (gpgme_op_encrypt): Remove hack that returns invalid
no recipient if no data was returned.
* encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns
no recipient if no data was returned.
* encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns
no recipient if no data was returned.
* engine.c (_gpgme_engine_op_verify): Add new argument to
differentiate detached from normal signatures.
* engine.h (_gpgme_engine_op_verify): Likewise for prototype.
* engine-gpgsm.c (_gpgme_gpgsm_op_verify): Likewise. Don't check
mode of data argument.
* engine-gpgsm.h (_gpgme_gpgsm_op_verify): Likewise for prototype.
* gpgme.h (gpgme_op_verify_start): Likewise for prototype.
(gpgme_op_verify): Likewise for prototype.
* rungpg.c (_gpgme_gpg_op_verify): Likewise.
* rungpg.h (_gpgme_gpg_op_verify): Likewise for prototype.
* verify.c (_gpgme_op_verify_start): Likewise.
(gpgme_op_verify_start): Likewise.
(gpgme_op_verify): Likewise.
* rungpg.c (struct arg_and_data_s): New member INBOUND to hold
direction of data object.
(_gpgme_gpg_add_data): Add new argument INBOUND. Use it to
determine direction of data object.
(_gpgme_gpg_add_pm_data, _gpgme_gpg_set_command_handler,
_gpgme_gpg_op_decrypt, _gpgme_gpg_op_edit, _gpgme_gpg_op_encrypt,
_gpgme_gpg_op_encrypt_sign, _gpgme_gpg_op_export,
_gpgme_gpg_op_genkey, _gpgme_gpg_op_import, _gpgme_gpg_op_sign,
_gpgme_gpg_op_verify): Add new argument to _gpgme_gpg_add_data
invocation.
(build_argv): Use new member INBOUND to determine direction of
file descriptor. Don't check the data type.
* rungpg.h (_gpgme_gpg_add_data): Add new argument to prototype.
* gpgme.c (gpgme_get_op_info): Don't call
_gpgme_data_get_as_string if CTX->op_info is NULL.
* version.c (gpgme_check_engine): Function removed.
tests/
2002-10-09 Marcus Brinkmann <marcus@g10code.de>
* gpg/t-decrypt.c (print_data): Update to new gpgme_data_read
interface, and use gpgme_engine_check_version instead
gpgme_check_version.
* gpg/t-decrypt-verify.c (print_data): Likewise.
* gpg/t-edit.c (main): Likewise.
* gpg/t-encrypt.c (print_data): Likewise.
* gpg/t-encrypt-sign.c (print_data): Likewise.
* gpg/t-encrypt-sym.c (print_data): Likewise.
* gpg/t-eventloop.c (print_data): Likewise.
* gpg/t-export.c (print_data): Likewise.
* gpg/t-sign.c (print_data): Likewise.
* gpg/t-signers.c (print_data): Likewise.
* gpgsm/t-decrypt.c (print_data): Likewise.
* gpgsm/t-encrypt.c (print_data): Likewise.
* gpgsm/t-export.c (print_data): Likewise.
* gpgsm/t-sign.c (print_data): Likewise.
* gpg/t-verify.c (main): Likewise for gpgme_op_verify.
* gpgsm/t-verify.c (main): Likewise for gpgme_op_verify.
* t-data.c (read_once_test): Likewise.
(write_test): Update for new behaviour of data objects.
(main): Remove type test.
2002-10-09 00:16:38 +00:00
|
|
|
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);
|
2002-07-03 02:18:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Stripped down version of gpgme/wait.c. */
|
|
|
|
|
|
|
|
struct op_result
|
|
|
|
{
|
|
|
|
int done;
|
2003-05-18 20:45:24 +00:00
|
|
|
gpgme_error_t err;
|
2002-07-03 02:18:43 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct op_result op_result;
|
|
|
|
|
|
|
|
struct one_fd
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
int dir;
|
2003-05-18 20:45:24 +00:00
|
|
|
gpgme_io_cb_t fnc;
|
2002-07-03 02:18:43 +00:00
|
|
|
void *fnc_data;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define FDLIST_MAX 32
|
|
|
|
struct one_fd fdlist[FDLIST_MAX];
|
|
|
|
|
2003-05-18 20:45:24 +00:00
|
|
|
gpgme_error_t
|
|
|
|
add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data,
|
2002-07-03 02:18:43 +00:00
|
|
|
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
|
2003-05-18 20:45:24 +00:00
|
|
|
io_event (void *data, gpgme_event_io_t type, void *type_data)
|
2002-07-03 02:18:43 +00:00
|
|
|
{
|
|
|
|
struct op_result *result = data;
|
|
|
|
|
|
|
|
if (type == GPGME_EVENT_DONE)
|
|
|
|
{
|
|
|
|
result->done = 1;
|
2003-05-18 20:45:24 +00:00
|
|
|
result->err = * (gpgme_error_t *) type_data;
|
2002-07-03 02:18:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2003-05-18 20:45:24 +00:00
|
|
|
struct gpgme_io_cbs io_cbs =
|
2002-07-03 02:18:43 +00:00
|
|
|
{
|
|
|
|
add_io_cb,
|
|
|
|
fdlist,
|
|
|
|
remove_io_cb,
|
|
|
|
io_event,
|
|
|
|
&op_result
|
|
|
|
};
|
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
{
|
2003-05-18 20:45:24 +00:00
|
|
|
gpgme_ctx_t ctx;
|
|
|
|
gpgme_error_t err;
|
|
|
|
gpgme_data_t in, out;
|
|
|
|
gpgme_recipients_t rset;
|
2002-07-03 02:18:43 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < FDLIST_MAX; i++)
|
|
|
|
fdlist[i].fd = -1;
|
|
|
|
|
gpgme/
2002-10-08 Marcus Brinkmann <marcus@g10code.de>
New data object component:
* gpgme.h (GpgmeDataReadCb, GpgmeDataWriteCb, GpgmeDataSeekCb,
GpgmeDataReleaseCb): New types.
(struct GpgmeDataCbs): New structure.
(gpgme_data_read): Changed prototype to match that of read() closely.
(gpgme_data_write): Similar for write().
(gpgme_data_seek, gpgme_data_new_from_cbs, gpgme_data_new_from_fd,
gpgme_data_new_from_stream): New prototypes.
(gpgme_data_get_type, gpgme_check_engine): Prototype removed.
* Makefile.am (libgpgme_la_SOURCES): Add data.h, data-fd.c,
data-stream.c, data-mem.c, data-user.c and data-compat.c.
* data.c: Reimplemented from scratch.
* (data-compat.c, data-fd.c, data.h, data-mem.c, data-stream.c,
data-user.c): New file.
* context.h (struct gpgme_data_s): Removed.
* conversion.c: Include <errno.h> and <sys/types.h>.
(_gpgme_data_append): New function.
* data.c (_gpgme_data_append_string): Move to ...
* conversion.c (_gpgme_data_append_string): ... here.
* data.c (_gpgme_data_append_for_xml): Move to ...
* conversion.c (_gpgme_data_append_for_xml): ... here.
* data.c (_gpgme_data_append_string_for_xml): Move to ...
* conversion.c (_gpgme_data_append_string_for_xml): ... here.
* data.c (_gpgme_data_append_percentstring_for_xml): Move to ...
* conversion.c (_gpgme_data_append_percentstring_for_xml): ... here.
* ops.h (_gpgme_data_get_mode, _gpgme_data_set_mode): Prototype
removed.
* types.h (GpgmeDataMode): Type removed.
* decrypt.c (_gpgme_decrypt_start): Don't check data type or mode.
* edit.c (_gpgme_op_edit_start): Likewise.
* encrypt.c (_gpgme_op_encrypt_start): Likewise.
* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Likewise.
* export.c (_gpgme_op_export_start): Likewise.
* genkey.c (_gpgme_op_genkey_start): Likewise.
* import.c (_gpgme_op_import_start): Likewise.
* sign.c (_gpgme_op_sign_start): Likewise.
* verify.c (_gpgme_op_verify_start): Likewise.
* encrypt.c (gpgme_op_encrypt): Remove hack that returns invalid
no recipient if no data was returned.
* encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns
no recipient if no data was returned.
* encrypt-sign.c (gpgme_op_encrypt_sign): Remove hack that returns
no recipient if no data was returned.
* engine.c (_gpgme_engine_op_verify): Add new argument to
differentiate detached from normal signatures.
* engine.h (_gpgme_engine_op_verify): Likewise for prototype.
* engine-gpgsm.c (_gpgme_gpgsm_op_verify): Likewise. Don't check
mode of data argument.
* engine-gpgsm.h (_gpgme_gpgsm_op_verify): Likewise for prototype.
* gpgme.h (gpgme_op_verify_start): Likewise for prototype.
(gpgme_op_verify): Likewise for prototype.
* rungpg.c (_gpgme_gpg_op_verify): Likewise.
* rungpg.h (_gpgme_gpg_op_verify): Likewise for prototype.
* verify.c (_gpgme_op_verify_start): Likewise.
(gpgme_op_verify_start): Likewise.
(gpgme_op_verify): Likewise.
* rungpg.c (struct arg_and_data_s): New member INBOUND to hold
direction of data object.
(_gpgme_gpg_add_data): Add new argument INBOUND. Use it to
determine direction of data object.
(_gpgme_gpg_add_pm_data, _gpgme_gpg_set_command_handler,
_gpgme_gpg_op_decrypt, _gpgme_gpg_op_edit, _gpgme_gpg_op_encrypt,
_gpgme_gpg_op_encrypt_sign, _gpgme_gpg_op_export,
_gpgme_gpg_op_genkey, _gpgme_gpg_op_import, _gpgme_gpg_op_sign,
_gpgme_gpg_op_verify): Add new argument to _gpgme_gpg_add_data
invocation.
(build_argv): Use new member INBOUND to determine direction of
file descriptor. Don't check the data type.
* rungpg.h (_gpgme_gpg_add_data): Add new argument to prototype.
* gpgme.c (gpgme_get_op_info): Don't call
_gpgme_data_get_as_string if CTX->op_info is NULL.
* version.c (gpgme_check_engine): Function removed.
tests/
2002-10-09 Marcus Brinkmann <marcus@g10code.de>
* gpg/t-decrypt.c (print_data): Update to new gpgme_data_read
interface, and use gpgme_engine_check_version instead
gpgme_check_version.
* gpg/t-decrypt-verify.c (print_data): Likewise.
* gpg/t-edit.c (main): Likewise.
* gpg/t-encrypt.c (print_data): Likewise.
* gpg/t-encrypt-sign.c (print_data): Likewise.
* gpg/t-encrypt-sym.c (print_data): Likewise.
* gpg/t-eventloop.c (print_data): Likewise.
* gpg/t-export.c (print_data): Likewise.
* gpg/t-sign.c (print_data): Likewise.
* gpg/t-signers.c (print_data): Likewise.
* gpgsm/t-decrypt.c (print_data): Likewise.
* gpgsm/t-encrypt.c (print_data): Likewise.
* gpgsm/t-export.c (print_data): Likewise.
* gpgsm/t-sign.c (print_data): Likewise.
* gpg/t-verify.c (main): Likewise for gpgme_op_verify.
* gpgsm/t-verify.c (main): Likewise for gpgme_op_verify.
* t-data.c (read_once_test): Likewise.
(write_test): Update for new behaviour of data objects.
(main): Remove type test.
2002-10-09 00:16:38 +00:00
|
|
|
err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
|
2002-07-03 02:18:43 +00:00
|
|
|
fail_if_err (err);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
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_recipients_new (&rset);
|
|
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_recipients_add_name_with_validity (rset, "Bob",
|
|
|
|
GPGME_VALIDITY_FULL);
|
|
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_recipients_add_name_with_validity (rset, "Alpha",
|
|
|
|
GPGME_VALIDITY_FULL);
|
|
|
|
fail_if_err (err);
|
|
|
|
|
|
|
|
err = gpgme_op_encrypt_start (ctx, rset, 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_recipients_release (rset);
|
|
|
|
gpgme_data_release (in);
|
|
|
|
gpgme_data_release (out);
|
|
|
|
gpgme_release (ctx);
|
|
|
|
}
|
|
|
|
while (argc > 1 && !strcmp (argv[1], "--loop"));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|