GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2003-05-28 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* gpgsm/t-encrypt.c (main): Likewise.
	* gpgsm/t-export.c (main): Likewise.
This commit is contained in:
Marcus Brinkmann 2003-05-28 01:50:15 +00:00
parent 05040ea3ba
commit 92e9e8dd3a
3 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ChangeLog
View File

@ -4,6 +4,8 @@
* gpg/t-encrypt-sign.c (main): Likewise. * gpg/t-encrypt-sign.c (main): Likewise.
* gpg/t-encrypt.c (main): Likewise. * gpg/t-encrypt.c (main): Likewise.
* gpg/t-export.c (main): Likewise. * gpg/t-export.c (main): Likewise.
* gpgsm/t-encrypt.c (main): Likewise.
* gpgsm/t-export.c (main): Likewise.
2003-05-27 Marcus Brinkmann <marcus@g10code.de> 2003-05-27 Marcus Brinkmann <marcus@g10code.de>

10
tests/gpgsm/t-encrypt.c
View File

@ -60,7 +60,7 @@ main (int argc, char **argv)
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err; gpgme_error_t err;
gpgme_data_t in, out; gpgme_data_t in, out;
gpgme_recipients_t rset; gpgme_user_id_t rset = NULL;
gpgme_encrypt_result_t result; gpgme_encrypt_result_t result;
err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS); err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
@ -77,11 +77,9 @@ main (int argc, char **argv)
err = gpgme_data_new (&out); err = gpgme_data_new (&out);
fail_if_err (err); fail_if_err (err);
err = gpgme_recipients_new (&rset); err = gpgme_user_ids_append (&rset, "test cert 1");
fail_if_err (err);
err = gpgme_recipients_add_name_with_validity (rset, "test cert 1",
GPGME_VALIDITY_FULL);
fail_if_err (err); fail_if_err (err);
rset->validity = GPGME_VALIDITY_FULL;
err = gpgme_op_encrypt (ctx, rset, in, out); err = gpgme_op_encrypt (ctx, rset, in, out);
fail_if_err (err); fail_if_err (err);
@ -94,7 +92,7 @@ main (int argc, char **argv)
} }
print_data (out); print_data (out);
gpgme_recipients_release (rset); gpgme_user_ids_release (rset);
gpgme_data_release (in); gpgme_data_release (in);
gpgme_data_release (out); gpgme_data_release (out);
gpgme_release (ctx); gpgme_release (ctx);

68
tests/gpgsm/t-export.c
View File

@ -1,23 +1,22 @@
/* t-export.c - regression test /* t-export.c - Regression test.
* Copyright (C) 2000 Werner Koch (dd9jn) Copyright (C) 2000 Werner Koch (dd9jn)
* Copyright (C) 2001 g10 Code GmbH Copyright (C) 2001, 2003 g10 Code GmbH
*
* This file is part of GPGME. This file is part of GPGME.
*
* GPGME is free software; you can redistribute it and/or modify GPGME is free software; you can redistribute it and/or modify it
* it under the terms of the GNU General Public License as published by under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. (at your option) any later version.
*
* GPGME is distributed in the hope that it will be useful, GPGME is distributed in the hope that it will be useful, but
* but WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. General Public License for more details.
*
* You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software along with GPGME; if not, write to the Free Software Foundation,
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -26,11 +25,18 @@
#include <gpgme.h> #include <gpgme.h>
#define fail_if_err(a) do { if(a) { \ #define fail_if_err(err) \
do \
{ \
if (err) \
{ \
fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror(a)); \ __FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); } \ exit (1); \
} while(0) } \
} \
while (0)
static void static void
print_data (gpgme_data_t dh) print_data (gpgme_data_t dh)
@ -49,14 +55,13 @@ print_data (gpgme_data_t dh)
int int
main (int argc, char **argv ) main (int argc, char *argv[])
{ {
gpgme_ctx_t ctx; gpgme_ctx_t ctx;
gpgme_error_t err; gpgme_error_t err;
gpgme_data_t out; gpgme_data_t out;
gpgme_recipients_t rset; gpgme_user_id_t rset = NULL;
do {
err = gpgme_new (&ctx); err = gpgme_new (&ctx);
fail_if_err (err); fail_if_err (err);
gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS); gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
@ -64,9 +69,7 @@ main (int argc, char **argv )
err = gpgme_data_new (&out); err = gpgme_data_new (&out);
fail_if_err (err); fail_if_err (err);
err = gpgme_recipients_new (&rset); err = gpgme_user_ids_append (&rset, "DFN Top Level Certification Authority");
fail_if_err (err);
err = gpgme_recipients_add_name (rset, "DFN Top Level Certification Authority");
fail_if_err (err); fail_if_err (err);
gpgme_set_armor (ctx, 1); gpgme_set_armor (ctx, 1);
@ -78,12 +81,9 @@ main (int argc, char **argv )
print_data (out); print_data (out);
fputs ("End Result.\n", stdout); fputs ("End Result.\n", stdout);
gpgme_recipients_release (rset); gpgme_user_ids_release (rset);
gpgme_data_release (out); gpgme_data_release (out);
gpgme_release (ctx); gpgme_release (ctx);
} while ( argc > 1 && !strcmp( argv[1], "--loop" ) );
return 0; return 0;
} }