0447e0dd6d
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.
171 lines
4.4 KiB
C
171 lines
4.4 KiB
C
/* t-keylist.c - regression test
|
|
* Copyright (C) 2000 Werner Koch (dd9jn)
|
|
* Copyright (C) 2001 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 this program; 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 <gpgme.h>
|
|
|
|
#define fail_if_err(a) do { if(a) { \
|
|
fprintf (stderr, "%s:%d: GpgmeError %s\n", \
|
|
__FILE__, __LINE__, gpgme_strerror(a)); \
|
|
exit (1); } \
|
|
} while(0)
|
|
|
|
static void
|
|
doit (GpgmeCtx ctx, const char *pattern)
|
|
{
|
|
GpgmeError err;
|
|
GpgmeKey key;
|
|
|
|
err = gpgme_op_keylist_start (ctx, pattern, 0);
|
|
fail_if_err (err);
|
|
|
|
while (!(err = gpgme_op_keylist_next (ctx, &key)))
|
|
{
|
|
char *p;
|
|
const char *s;
|
|
int i;
|
|
|
|
printf ("<!-- Begin key object (%p) -->\n", key);
|
|
p = gpgme_key_get_as_xml (key);
|
|
if (p)
|
|
{
|
|
fputs (p, stdout);
|
|
free (p);
|
|
}
|
|
else
|
|
fputs("<!-- Ooops: gpgme_key_get_as_xml failed -->\n", stdout);
|
|
|
|
for (i = 0; ; i++)
|
|
{
|
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEYID, NULL, i);
|
|
if (!s)
|
|
break;
|
|
printf ("<!-- keyid.%d=%s -->\n", i, s);
|
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_ALGO, NULL, i);
|
|
printf ("<!-- algo.%d=%s -->\n", i, s);
|
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEY_CAPS, NULL, i);
|
|
printf ("<!-- caps.%d=%s -->\n", i, s);
|
|
}
|
|
for (i = 0; ; i++)
|
|
{
|
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_NAME, NULL, i);
|
|
if (!s)
|
|
break;
|
|
printf ("<!-- name.%d=%s -->\n", i, s);
|
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_EMAIL, NULL, i);
|
|
printf ("<!-- email.%d=%s -->\n", i, s);
|
|
s = gpgme_key_get_string_attr (key, GPGME_ATTR_COMMENT, NULL, i);
|
|
printf ("<!-- comment.%d=%s -->\n", i, s);
|
|
}
|
|
|
|
fputs ("<!-- usable for:", stdout);
|
|
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_ENCRYPT, NULL, 0))
|
|
fputs (" encryption", stdout);
|
|
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_SIGN, NULL, 0))
|
|
fputs (" signing", stdout);
|
|
if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_CERTIFY, NULL, 0))
|
|
fputs (" certification", stdout);
|
|
fputs (" -->\n", stdout );
|
|
|
|
printf ("<!-- End key object (%p) -->\n", key);
|
|
gpgme_key_release (key);
|
|
}
|
|
if (err != GPGME_EOF)
|
|
fail_if_err (err);
|
|
}
|
|
|
|
|
|
/*
|
|
* Check that there are no problems when we are using two context for
|
|
* listing keys.
|
|
*/
|
|
static void
|
|
check_two_contexts (void)
|
|
{
|
|
GpgmeError err;
|
|
GpgmeCtx ctx1, ctx2;
|
|
GpgmeKey key;
|
|
|
|
err = gpgme_new(&ctx1); fail_if_err (err);
|
|
err = gpgme_op_keylist_start(ctx1, "", 1);
|
|
fail_if_err (err);
|
|
err = gpgme_new(&ctx2); fail_if_err (err);
|
|
err = gpgme_op_keylist_start(ctx2, "", 1);
|
|
fail_if_err (err);
|
|
|
|
while ((err = gpgme_op_keylist_next (ctx2, &key)) != GPGME_EOF)
|
|
gpgme_key_release (key);
|
|
|
|
if (err != GPGME_EOF)
|
|
fail_if_err (err);
|
|
while ((err=gpgme_op_keylist_next(ctx1, &key)) != GPGME_EOF)
|
|
gpgme_key_release (key);
|
|
|
|
if (err != GPGME_EOF)
|
|
fail_if_err (err);
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
GpgmeCtx ctx;
|
|
GpgmeError err;
|
|
int loop = 0;
|
|
const char *pattern;
|
|
|
|
if (argc)
|
|
{
|
|
argc--;
|
|
argv++;
|
|
}
|
|
|
|
if (argc && !strcmp( *argv, "--loop"))
|
|
{
|
|
loop = 1;
|
|
argc--; argv++;
|
|
}
|
|
pattern = argc? *argv : NULL;
|
|
|
|
err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_new (&ctx);
|
|
fail_if_err (err);
|
|
/* No validity calculation. */
|
|
gpgme_set_keylist_mode (ctx, 1);
|
|
do
|
|
{
|
|
fprintf (stderr, "** pattern=`%s'\n", pattern ? pattern : "(null)");
|
|
doit (ctx, pattern);
|
|
}
|
|
while (loop);
|
|
gpgme_release (ctx);
|
|
|
|
check_two_contexts ();
|
|
|
|
return 0;
|
|
}
|