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.
288 lines
7.4 KiB
C
288 lines
7.4 KiB
C
/* t-data - Regression tests for the GpgmeData abstraction.
|
|
* 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 <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <gpgme.h>
|
|
|
|
#define fail_if_err(a) do { if(a) { \
|
|
fprintf (stderr, "%s:%d: (%i) GpgmeError " \
|
|
"%s\n", __FILE__, __LINE__, round, \
|
|
gpgme_strerror(a)); \
|
|
exit (1); } \
|
|
} while(0)
|
|
|
|
static char *
|
|
make_filename (const char *fname)
|
|
{
|
|
const char *srcdir = getenv ("srcdir");
|
|
char *buf;
|
|
|
|
if (!srcdir)
|
|
srcdir = ".";
|
|
buf = malloc (strlen(srcdir) + strlen(fname) + 2 );
|
|
if (!buf)
|
|
{
|
|
fprintf (stderr, "%s:%d: could not allocate string: %s\n",
|
|
__FILE__, __LINE__, strerror (errno));
|
|
exit (1);
|
|
}
|
|
strcpy (buf, srcdir);
|
|
strcat (buf, "/");
|
|
strcat (buf, fname);
|
|
return buf;
|
|
}
|
|
|
|
typedef enum
|
|
{
|
|
TEST_INITIALIZER,
|
|
TEST_INVALID_ARGUMENT,
|
|
TEST_INOUT_NONE,
|
|
TEST_INOUT_MEM_NO_COPY,
|
|
TEST_INOUT_MEM_COPY,
|
|
TEST_INOUT_MEM_FROM_FILE_COPY,
|
|
TEST_INOUT_MEM_FROM_INEXISTANT_FILE,
|
|
TEST_INOUT_MEM_FROM_FILE_NO_COPY,
|
|
TEST_INOUT_MEM_FROM_FILE_PART_BY_NAME,
|
|
TEST_INOUT_MEM_FROM_INEXISTANT_FILE_PART,
|
|
TEST_INOUT_MEM_FROM_FILE_PART_BY_FP,
|
|
TEST_OUT_CB,
|
|
TEST_END
|
|
} round_t;
|
|
|
|
const char *text = "Just GNU it!\n";
|
|
const char *text2 = "Just GNU it!\nJust GNU it!\n";
|
|
|
|
int
|
|
read_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
|
|
{
|
|
static int off = 0;
|
|
int amount = strlen (text) - off;
|
|
/* round_t round = *((round_t *) cb_value); */
|
|
|
|
if (!buffer && !count && !nread)
|
|
{
|
|
/* Rewind requested. */
|
|
off = 0;
|
|
return 0;
|
|
}
|
|
if (! buffer || !nread)
|
|
return -1;
|
|
if (amount <= 0)
|
|
{
|
|
/* End of file. */
|
|
*nread = 0;
|
|
return -1;
|
|
}
|
|
if (amount > count)
|
|
amount = count;
|
|
memcpy (buffer, text, amount);
|
|
off += amount;
|
|
*nread = amount;
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
read_once_test (round_t round, GpgmeData data)
|
|
{
|
|
char buffer[1024];
|
|
size_t read;
|
|
|
|
read = gpgme_data_read (data, buffer, sizeof (buffer));
|
|
|
|
if (read != strlen (text) || strncmp (buffer, text, strlen (text)))
|
|
{
|
|
fprintf (stderr, "%s:%d: (%i) gpgme_data_read returned wrong data\n",
|
|
__FILE__, __LINE__, round);
|
|
exit (1);
|
|
}
|
|
|
|
read = gpgme_data_read (data, buffer, sizeof (buffer));
|
|
if (read)
|
|
{
|
|
fprintf (stderr, "%s:%d: (%i) gpgme_data_read did not signal EOF\n",
|
|
__FILE__, __LINE__, round);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
void
|
|
read_test (round_t round, GpgmeData data)
|
|
{
|
|
GpgmeError err;
|
|
char buffer[1024];
|
|
size_t read;
|
|
|
|
if (round == TEST_INOUT_NONE)
|
|
{
|
|
read = gpgme_data_read (data, buffer, sizeof (buffer));
|
|
if (read > 0)
|
|
{
|
|
fprintf (stderr, "%s:%d: (%i) gpgme_data_read succeded unexpectedly\n",
|
|
__FILE__, __LINE__, round);
|
|
exit (1);
|
|
}
|
|
return;
|
|
}
|
|
|
|
read_once_test (round, data);
|
|
err = gpgme_data_rewind (data);
|
|
fail_if_err (err);
|
|
read_once_test (round, data);
|
|
}
|
|
|
|
void
|
|
write_test (round_t round, GpgmeData data)
|
|
{
|
|
GpgmeError err;
|
|
char buffer[1024];
|
|
size_t amt;
|
|
|
|
amt = gpgme_data_write (data, text, strlen (text));
|
|
if (amt != strlen (text))
|
|
fail_if_err (GPGME_File_Error);
|
|
|
|
err = gpgme_data_rewind (data);
|
|
fail_if_err (err);
|
|
|
|
if (round == TEST_INOUT_NONE)
|
|
read_once_test (round, data);
|
|
else
|
|
{
|
|
amt = gpgme_data_read (data, buffer, sizeof (buffer));
|
|
|
|
if (amt != strlen (text2) || strncmp (buffer, text2, strlen (text2)))
|
|
{
|
|
fprintf (stderr, "%s:%d: (%i) gpgme_data_read returned wrong data\n",
|
|
__FILE__, __LINE__, round);
|
|
exit (1);
|
|
}
|
|
|
|
amt = gpgme_data_read (data, buffer, sizeof (buffer));
|
|
if (amt)
|
|
{
|
|
fprintf (stderr, "%s:%d: (%i) gpgme_data_read did not signal EOF\n",
|
|
__FILE__, __LINE__, round);
|
|
exit (1);
|
|
}
|
|
}
|
|
}
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
round_t round = TEST_INITIALIZER;
|
|
const char *text_filename = make_filename ("t-data-1.txt");
|
|
const char *longer_text_filename = make_filename ("t-data-2.txt");
|
|
const char *missing_filename = "this-file-surely-does-not-exist";
|
|
GpgmeError err = GPGME_No_Error;
|
|
GpgmeData data;
|
|
|
|
while (++round)
|
|
{
|
|
switch (round)
|
|
{
|
|
case TEST_INVALID_ARGUMENT:
|
|
err = gpgme_data_new (NULL);
|
|
if (!err)
|
|
{
|
|
fprintf (stderr, "%s:%d: gpgme_data_new on NULL pointer succeeded "
|
|
"unexpectedly\n", __FILE__, __LINE__);
|
|
exit (1);
|
|
}
|
|
continue;
|
|
case TEST_INOUT_NONE:
|
|
err = gpgme_data_new (&data);
|
|
break;
|
|
case TEST_INOUT_MEM_NO_COPY:
|
|
err = gpgme_data_new_from_mem (&data, text, strlen (text), 0);
|
|
break;
|
|
case TEST_INOUT_MEM_COPY:
|
|
err = gpgme_data_new_from_mem (&data, text, strlen (text), 1);
|
|
break;
|
|
case TEST_INOUT_MEM_FROM_FILE_COPY:
|
|
err = gpgme_data_new_from_file (&data, text_filename, 1);
|
|
break;
|
|
case TEST_INOUT_MEM_FROM_INEXISTANT_FILE:
|
|
err = gpgme_data_new_from_file (&data, missing_filename, 1);
|
|
if (!err)
|
|
{
|
|
fprintf (stderr, "%s:%d: gpgme_data_new_from_file on inexistant "
|
|
"file succeeded unexpectedly\n", __FILE__, __LINE__);
|
|
exit (1);
|
|
}
|
|
continue;
|
|
case TEST_INOUT_MEM_FROM_FILE_NO_COPY:
|
|
err = gpgme_data_new_from_file (&data, text_filename, 0);
|
|
/* This is not implemented yet. */
|
|
if (err == GPGME_Not_Implemented || err == GPGME_Invalid_Value)
|
|
continue;
|
|
break;
|
|
case TEST_INOUT_MEM_FROM_FILE_PART_BY_NAME:
|
|
err = gpgme_data_new_from_filepart (&data, longer_text_filename, 0,
|
|
strlen (text), strlen (text));
|
|
break;
|
|
case TEST_INOUT_MEM_FROM_INEXISTANT_FILE_PART:
|
|
err = gpgme_data_new_from_filepart (&data, missing_filename, 0,
|
|
strlen (text), strlen (text));
|
|
if (!err)
|
|
{
|
|
fprintf (stderr, "%s:%d: gpgme_data_new_from_file on inexistant "
|
|
"file succeeded unexpectedly\n", __FILE__, __LINE__);
|
|
exit (1);
|
|
}
|
|
continue;
|
|
case TEST_INOUT_MEM_FROM_FILE_PART_BY_FP:
|
|
{
|
|
FILE *fp = fopen (longer_text_filename, "rb");
|
|
if (! fp)
|
|
{
|
|
fprintf (stderr, "%s:%d: fopen: %s\n", __FILE__, __LINE__,
|
|
strerror (errno));
|
|
exit (1);
|
|
}
|
|
err = gpgme_data_new_from_filepart (&data, 0, fp,
|
|
strlen (text), strlen (text));
|
|
}
|
|
break;
|
|
case TEST_OUT_CB:
|
|
err = gpgme_data_new_with_read_cb (&data, read_cb, &round);
|
|
break;
|
|
case TEST_END:
|
|
return 0;
|
|
case TEST_INITIALIZER:
|
|
/* Shouldn't happen. */
|
|
fprintf (stderr, "%s:%d: impossible condition\n", __FILE__, __LINE__);
|
|
exit (1);
|
|
}
|
|
fail_if_err (err);
|
|
|
|
read_test (round, data);
|
|
if (round != TEST_OUT_CB)
|
|
write_test (round, data);
|
|
gpgme_data_release (data);
|
|
}
|
|
return 0;
|
|
}
|