174e293252
2003-04-28 Marcus Brinkmann <marcus@g10code.de> * gpgme.texi (Decrypt): Descript gpgme_op_decrypt_result and GpgmeDecryptResult. gpgme 2003-04-28 Marcus Brinkmann <marcus@g10code.de> * gpgme.h (struct _gpgme_op_decrypt_result): New structure. (GpgmeDecryptResult): New type. (gpgme_op_decrypt_result): New prototype. * ops.h (_gpgme_op_decrypt_init_result): New prototype. (_gpgme_decrypt_status_handler): Fix prototype. (_gpgme_decrypt_start): Remove prototype. * decrypt-verify.c: Do not include <stdio.h>, <stdlib.h>, <string.h> and <assert.h>, "util.h" and "context.h", but "gpgme.h". (decrypt_verify_status_handler): Change first argument to void *, and rework error handling. (_gpgme_op_decrypt_verify_start): New function. (gpgme_op_decrypt_verify_start): Rewrite using _gpgme_op_decrypt_verify_start. (gpgme_op_decrypt_verify): Likewise. * decrypt.c: Include <string.h>, "gpgme.h" and "util.h". (struct decrypt_result): Change to typedef op_data_t, rewritten. (is_token): Remove function. (release_op_data): New function. (skip_token): Remove function. (gpgme_op_decrypt_result): New function. (_gpgme_decrypt_status_handler): Change first argument to void *. Rework error handling. (_gpgme_decrypt_start): Rename to ... (decrypt_start): ... this. Call _gpgme_op_decrypt_init_result. (_gpgme_op_decrypt_init_result): New function. (gpgme_op_decrypt_start): Use decrypt_start. (gpgme_op_decrypt): Likewise. tests/ 2003-04-28 Marcus Brinkmann <marcus@g10code.de> * gpg/t-decrypt.c: Rewritten.
193 lines
4.9 KiB
C
193 lines
4.9 KiB
C
/* t-import.c - regression test
|
|
Copyright (C) 2000 Werner Koch (dd9jn)
|
|
Copyright (C) 2001, 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 <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
#include <gpgme.h>
|
|
|
|
|
|
#define fail_if_err(err) \
|
|
do \
|
|
{ \
|
|
if (err) \
|
|
{ \
|
|
fprintf (stderr, "%s:%d: GpgmeError %s\n", \
|
|
__FILE__, __LINE__, gpgme_strerror (err)); \
|
|
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;
|
|
}
|
|
|
|
|
|
void
|
|
check_result (GpgmeImportResult result, char *fpr, int total)
|
|
{
|
|
if (result->considered != total)
|
|
{
|
|
fprintf (stderr, "Unexpected number of considered keys %i\n",
|
|
result->considered);
|
|
exit (1);
|
|
}
|
|
if (result->no_user_id != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of user ids %i\n",
|
|
result->no_user_id);
|
|
exit (1);
|
|
}
|
|
if (result->imported != 0 && result->imported != 1)
|
|
{
|
|
fprintf (stderr, "Unexpected number of imported keys %i\n",
|
|
result->imported);
|
|
exit (1);
|
|
}
|
|
if (result->imported_rsa != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of imported RSA keys %i\n",
|
|
result->imported_rsa);
|
|
exit (1);
|
|
}
|
|
if ((result->imported == 0 && result->unchanged != total)
|
|
|| (result->imported == 1 && result->unchanged != total - 1))
|
|
{
|
|
fprintf (stderr, "Unexpected number of unchanged keys %i\n",
|
|
result->unchanged);
|
|
exit (1);
|
|
}
|
|
if (result->new_user_ids != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of new user IDs %i\n",
|
|
result->new_user_ids);
|
|
exit (1);
|
|
}
|
|
if (result->new_sub_keys != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of new sub keys %i\n",
|
|
result->new_sub_keys);
|
|
exit (1);
|
|
}
|
|
if (result->new_signatures != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of new signatures %i\n",
|
|
result->new_signatures);
|
|
exit (1);
|
|
}
|
|
if (result->new_revocations != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of new revocations %i\n",
|
|
result->new_revocations);
|
|
exit (1);
|
|
}
|
|
if (result->secret_read != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of secret keys read %i\n",
|
|
result->secret_read);
|
|
exit (1);
|
|
}
|
|
if (result->secret_imported != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of secret keys imported %i\n",
|
|
result->secret_imported);
|
|
exit (1);
|
|
}
|
|
if (result->secret_unchanged != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of secret keys unchanged %i\n",
|
|
result->secret_unchanged);
|
|
exit (1);
|
|
}
|
|
if (result->not_imported != 0)
|
|
{
|
|
fprintf (stderr, "Unexpected number of secret keys not imported %i\n",
|
|
result->not_imported);
|
|
exit (1);
|
|
}
|
|
if (result->imports)
|
|
{
|
|
fprintf (stderr, "Unexpected number of status reports\n");
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
GpgmeCtx ctx;
|
|
GpgmeError err;
|
|
GpgmeData in;
|
|
GpgmeImportResult result;
|
|
const char *cert_1 = make_filename ("cert_dfn_pca01.der");
|
|
const char *cert_2 = make_filename ("cert_dfn_pca15.der");
|
|
|
|
err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_new (&ctx);
|
|
fail_if_err (err);
|
|
|
|
gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
|
|
|
|
err = gpgme_data_new_from_file (&in, cert_1, 1);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_op_import (ctx, in);
|
|
fail_if_err (err);
|
|
result = gpgme_op_import_result (ctx);
|
|
check_result (result, "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 1);
|
|
gpgme_data_release (in);
|
|
|
|
err = gpgme_data_new_from_file (&in, cert_2, 1);
|
|
fail_if_err (err);
|
|
|
|
err = gpgme_op_import (ctx, in);
|
|
fail_if_err (err);
|
|
result = gpgme_op_import_result (ctx);
|
|
check_result (result, "2C8F3C356AB761CB3674835B792CDA52937F9285", 2);
|
|
gpgme_data_release (in);
|
|
|
|
gpgme_release (ctx);
|
|
return 0;
|
|
}
|