aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg
diff options
context:
space:
mode:
Diffstat (limited to 'tests/gpg')
-rw-r--r--tests/gpg/Makefile.am1
-rw-r--r--tests/gpg/t-decrypt-verify.c69
-rw-r--r--tests/gpg/t-decrypt.c64
-rw-r--r--tests/gpg/t-edit.c127
-rw-r--r--tests/gpg/t-encrypt-sign.c40
-rw-r--r--tests/gpg/t-encrypt-sym.c43
-rw-r--r--tests/gpg/t-encrypt.c33
-rw-r--r--tests/gpg/t-eventloop.c32
-rw-r--r--tests/gpg/t-export.c30
-rw-r--r--tests/gpg/t-genkey.c15
-rw-r--r--tests/gpg/t-import.c39
-rw-r--r--tests/gpg/t-keylist-sig.c18
-rw-r--r--tests/gpg/t-keylist.c17
-rw-r--r--tests/gpg/t-sign.c40
-rw-r--r--tests/gpg/t-signers.c40
-rw-r--r--tests/gpg/t-support.h81
-rw-r--r--tests/gpg/t-trustlist.c19
-rw-r--r--tests/gpg/t-verify.c25
18 files changed, 183 insertions, 550 deletions
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 370778c3..319f0d1a 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -24,6 +24,7 @@ GPG = @GPG@
TESTS_ENVIRONMENT = GNUPGHOME=. GPG_AGENT_INFO=
# The keylist tests must come after the import and the edit test.
+noinst_HEADERS = t-support.h
TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
t-decrypt t-verify t-decrypt-verify \
t-export t-import t-trustlist t-eventloop t-edit \
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index c89f7f47..9f45fffd 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -26,68 +26,9 @@
#include <gpgme.h>
-
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-#define BUF_SIZE 512
- char buf[BUF_SIZE + 1];
- 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, BUF_SIZE)) > 0)
- fwrite (buf, ret, 1, stdout);
- if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 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;
-}
-
+#include "t-support.h"
+
static void
check_verify_result (gpgme_verify_result_t result, int summary, char *fpr,
gpgme_error_t status)
@@ -113,7 +54,7 @@ check_verify_result (gpgme_verify_result_t result, int summary, char *fpr,
__FILE__, __LINE__, sig->fpr);
exit (1);
}
- if (sig->status != status)
+ if (gpg_err_code (sig->status) != status)
{
fprintf (stderr, "%s:%i: Unexpected signature status: %s\n",
__FILE__, __LINE__, gpgme_strerror (sig->status));
@@ -137,7 +78,7 @@ check_verify_result (gpgme_verify_result_t result, int summary, char *fpr,
__FILE__, __LINE__, sig->validity);
exit (1);
}
- if (sig->validity_reason != GPGME_No_Error)
+ if (gpg_err_code (sig->validity_reason) != GPG_ERR_NO_ERROR)
{
fprintf (stderr, "%s:%i: Unexpected validity reason: %s\n",
__FILE__, __LINE__, gpgme_strerror (sig->validity_reason));
@@ -182,7 +123,7 @@ main (int argc, char *argv[])
verify_result = gpgme_op_verify_result (ctx);
check_verify_result (verify_result, 0,
"A0FF4590BB6122EDEF6E3C542D727CC768697734",
- GPGME_No_Error);
+ GPG_ERR_NO_ERROR);
gpgme_data_release (in);
gpgme_data_release (out);
diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c
index 7b406a76..8c18d783 100644
--- a/tests/gpg/t-decrypt.c
+++ b/tests/gpg/t-decrypt.c
@@ -1,4 +1,4 @@
-/* t-decrypt.c - regression test
+/* t-decrypt.c - Regression test.
Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2003 g10 Code GmbH
@@ -26,67 +26,9 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-#define BUF_SIZE 512
- char buf[BUF_SIZE + 1];
- 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, BUF_SIZE)) > 0)
- fwrite (buf, ret, 1, stdout);
- if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 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;
-}
-
+#include "t-support.h"
+
int
main (int argc, char *argv[])
{
diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c
index 9238503e..d2d2e1b8 100644
--- a/tests/gpg/t-edit.c
+++ b/tests/gpg/t-edit.c
@@ -1,23 +1,22 @@
-/* t-edit.c - regression test
- * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+/* t-edit.c - Regression test.
+ 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. */
#include <stdio.h>
#include <stdlib.h>
@@ -25,23 +24,13 @@
#include <assert.h>
#include <errno.h>
#include <unistd.h>
+#include <errno.h>
#include <gpgme.h>
-struct passphrase_cb_info_s {
- gpgme_ctx_t c;
- int did_it;
-};
-
-
-#define fail_if_err(a) do { if(a) { int my_errno = errno; \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror(a)); \
- if ((a) == GPGME_File_Error) \
- fprintf (stderr, "\terrno=`%s'\n", strerror (my_errno)); \
- exit (1); } \
- } while(0)
+#include "t-support.h"
+
static void
flush_data (gpgme_data_t dh)
{
@@ -50,20 +39,11 @@ flush_data (gpgme_data_t dh)
ret = gpgme_data_seek (dh, 0, SEEK_SET);
if (ret)
- fail_if_err (GPGME_File_Error);
+ fail_if_err (gpg_error_from_errno (errno));
while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
fwrite (buf, ret, 1, stdout);
if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 0;
+ fail_if_err (gpg_error_from_errno (errno));
}
@@ -130,43 +110,34 @@ main (int argc, char **argv)
gpgme_error_t err;
gpgme_data_t out = NULL;
gpgme_key_t key = NULL;
- struct passphrase_cb_info_s info;
const char *pattern = "Alpha";
- char *p;
+ char *agent_info;
- do
- {
- err = gpgme_new (&ctx);
- fail_if_err (err);
- err = gpgme_data_new (&out);
- fail_if_err (err);
+ err = gpgme_new (&ctx);
+ fail_if_err (err);
+ err = gpgme_data_new (&out);
+ fail_if_err (err);
- p = getenv("GPG_AGENT_INFO");
- if (!(p && strchr (p, ':')))
- {
- memset (&info, 0, sizeof info);
- info.c = ctx;
- gpgme_set_passphrase_cb (ctx, passphrase_cb, &info);
- }
-
- err = gpgme_op_keylist_start (ctx, pattern, 0);
- fail_if_err (err);
- err = gpgme_op_keylist_next (ctx, &key);
- fail_if_err (err);
- err = gpgme_op_keylist_end (ctx);
- fail_if_err (err);
-
- err = gpgme_op_edit (ctx, key, edit_fnc, out, out);
- fail_if_err (err);
-
- fputs ("[-- Last response --]\n", stdout);
- flush_data (out);
-
- gpgme_data_release (out);
- gpgme_key_unref (key);
- gpgme_release (ctx);
- }
- while (argc > 1 && !strcmp( argv[1], "--loop"));
+ agent_info = getenv("GPG_AGENT_INFO");
+ if (!(agent_info && strchr (agent_info, ':')))
+ gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
+
+ err = gpgme_op_keylist_start (ctx, pattern, 0);
+ fail_if_err (err);
+ err = gpgme_op_keylist_next (ctx, &key);
+ fail_if_err (err);
+ err = gpgme_op_keylist_end (ctx);
+ fail_if_err (err);
+
+ err = gpgme_op_edit (ctx, key, edit_fnc, out, out);
+ fail_if_err (err);
+
+ fputs ("[-- Last response --]\n", stdout);
+ flush_data (out);
+
+ gpgme_data_release (out);
+ gpgme_key_unref (key);
+ gpgme_release (ctx);
return 0;
}
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index 40a654be..fc99d56c 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -25,45 +25,9 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-#define BUF_SIZE 512
- char buf[BUF_SIZE + 1];
- 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, BUF_SIZE)) > 0)
- fwrite (buf, ret, 1, stdout);
- if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 0;
-}
-
+#include "t-support.h"
+
static void
check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
{
diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 41fe3085..7c84f3dc 100644
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -1,4 +1,4 @@
-/* t-encrypt-sym.c - regression test
+/* t-encrypt-sym.c - Regression test.
Copyright (C) 2000 Werner Koch (dd9jn)
Copyright (C) 2001, 2003 g10 Code GmbH
@@ -26,46 +26,11 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
- char buf[100];
- 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);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 0;
-}
-
+#include "t-support.h"
+
int
-main (int argc, char **argv)
+main (int argc, char *argv[])
{
gpgme_ctx_t ctx;
gpgme_error_t err;
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 1373a397..bebd9938 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -24,38 +24,11 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-#define BUF_SIZE 512
- char buf[BUF_SIZE + 1];
- 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, BUF_SIZE)) > 0)
- fwrite (buf, ret, 1, stdout);
- if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
+#include "t-support.h"
+
int
-main (int argc, char **argv)
+main (int argc, char *argv[])
{
gpgme_ctx_t ctx;
gpgme_error_t err;
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 990876d7..43e2c09b 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -27,35 +27,9 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
- char buf[100];
- 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);
-}
-
+#include "t-support.h"
+
/* Stripped down version of gpgme/wait.c. */
struct op_result
@@ -96,7 +70,7 @@ add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data,
}
}
if (i == FDLIST_MAX)
- return GPGME_General_Error;
+ return gpg_err_make (GPG_ERR_SOURCE_USER_1, GPG_ERR_GENERAL);
*r_tag = &fds[i];
return 0;
}
diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index 7ec69e6f..a5c24fc6 100644
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -25,35 +25,9 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
- char buf[100];
- 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);
-}
-
+#include "t-support.h"
+
int
main (int argc, char **argv)
{
diff --git a/tests/gpg/t-genkey.c b/tests/gpg/t-genkey.c
index 40aa3036..b218122e 100644
--- a/tests/gpg/t-genkey.c
+++ b/tests/gpg/t-genkey.c
@@ -24,20 +24,11 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
+#include "t-support.h"
+
/* True if progress function printed something on the screen. */
-int progress_called;
+static int progress_called;
static void
progress (void *self, const char *what, int type, int current, int total)
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index fd275080..3733d5c6 100644
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -25,38 +25,9 @@
#include <gpgme.h>
-
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static char *
-mk_fname (const char *fname)
-{
- const char *srcdir = getenv ("srcdir");
- char *buf;
-
- if (!srcdir)
- srcdir = ".";
- buf = malloc (strlen(srcdir) + strlen(fname) + 2);
- if (!buf)
- exit (8);
- strcpy (buf, srcdir);
- strcat (buf, "/");
- strcat (buf, fname);
- return buf;
-}
-
+#include "t-support.h"
+
void
check_result (gpgme_import_result_t result, char *fpr, int secret)
{
@@ -223,14 +194,14 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
int
-main (int argc, char **argv)
+main (int argc, char *argv[])
{
gpgme_ctx_t ctx;
gpgme_error_t err;
gpgme_data_t in;
gpgme_import_result_t result;
- const char *pubkey_1_asc = mk_fname ("pubkey-1.asc");
- const char *seckey_1_asc = mk_fname ("seckey-1.asc");
+ const char *pubkey_1_asc = make_filename ("pubkey-1.asc");
+ const char *seckey_1_asc = make_filename ("seckey-1.asc");
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c
index 63251ad7..1a897686 100644
--- a/tests/gpg/t-keylist-sig.c
+++ b/tests/gpg/t-keylist-sig.c
@@ -24,20 +24,9 @@
#include <gpgme.h>
-
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
+#include "t-support.h"
+
struct
{
char *fpr;
@@ -74,6 +63,7 @@ keys[] =
{ NULL }
};
+
int
main (int argc, char **argv)
{
@@ -611,7 +601,7 @@ main (int argc, char **argv)
gpgme_key_unref (key);
i++;
}
- if (err != GPGME_EOF)
+ if (gpg_err_code (err) != GPG_ERR_EOF)
fail_if_err (err);
err = gpgme_op_keylist_end (ctx);
fail_if_err (err);
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index a4c46ae8..9e68f0cc 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -24,20 +24,9 @@
#include <gpgme.h>
-
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
+#include "t-support.h"
+
struct
{
char *fpr;
@@ -514,7 +503,7 @@ main (int argc, char **argv)
gpgme_key_unref (key);
i++;
}
- if (err != GPGME_EOF)
+ if (gpg_err_code (err) != GPG_ERR_EOF)
fail_if_err (err);
err = gpgme_op_keylist_end (ctx);
fail_if_err (err);
diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c
index cb32246d..ff40e7cd 100644
--- a/tests/gpg/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -25,45 +25,9 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-#define BUF_SIZE 512
- char buf[BUF_SIZE + 1];
- 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, BUF_SIZE)) > 0)
- fwrite (buf, ret, 1, stdout);
- if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 0;
-}
-
+#include "t-support.h"
+
static void
check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
{
diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c
index 3c97a735..12b0b083 100644
--- a/tests/gpg/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -25,45 +25,9 @@
#include <gpgme.h>
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-#define BUF_SIZE 512
- char buf[BUF_SIZE + 1];
- 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, BUF_SIZE)) > 0)
- fwrite (buf, ret, 1, stdout);
- if (ret < 0)
- fail_if_err (GPGME_File_Error);
-}
-
-
-static gpgme_error_t
-passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
- int last_was_bad, int fd)
-{
- write (fd, "abc\n", 4);
- return 0;
-}
-
+#include "t-support.h"
+
static void
check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
{
diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h
new file mode 100644
index 00000000..8f91838d
--- /dev/null
+++ b/tests/gpg/t-support.h
@@ -0,0 +1,81 @@
+/* t-support.h - Helper routines for regression tests.
+ 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. */
+
+#include <unistd.h>
+#include <errno.h>
+
+#include <gpgme.h>
+
+#define fail_if_err(err) \
+ do \
+ { \
+ if (err) \
+ { \
+ fprintf (stderr, "%s:%d: %s: %s\n", \
+ __FILE__, __LINE__, gpgme_strsource (err), \
+ gpgme_strerror (err)); \
+ exit (1); \
+ } \
+ } \
+ while (0)
+
+
+void
+print_data (gpgme_data_t dh)
+{
+#define BUF_SIZE 512
+ char buf[BUF_SIZE + 1];
+ int ret;
+
+ ret = gpgme_data_seek (dh, 0, SEEK_SET);
+ if (ret)
+ fail_if_err (gpgme_error_from_errno (errno));
+ while ((ret = gpgme_data_read (dh, buf, BUF_SIZE)) > 0)
+ fwrite (buf, ret, 1, stdout);
+ if (ret < 0)
+ fail_if_err (gpgme_error_from_errno (errno));
+}
+
+
+gpgme_error_t
+passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
+ int last_was_bad, int fd)
+{
+ write (fd, "abc\n", 4);
+ return 0;
+}
+
+
+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)
+ exit (8);
+ strcpy (buf, srcdir);
+ strcat (buf, "/");
+ strcat (buf, fname);
+ return buf;
+}
diff --git a/tests/gpg/t-trustlist.c b/tests/gpg/t-trustlist.c
index d7c6bc8c..db10cf0c 100644
--- a/tests/gpg/t-trustlist.c
+++ b/tests/gpg/t-trustlist.c
@@ -24,20 +24,9 @@
#include <gpgme.h>
-
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
-
+#include "t-support.h"
+
int
main (int argc, char *argv[])
{
@@ -50,7 +39,7 @@ main (int argc, char *argv[])
err = gpgme_op_trustlist_start (ctx, "alice", 0);
fail_if_err (err);
-
+
while (!(err = gpgme_op_trustlist_next (ctx, &item)))
{
printf ("l=%d k=%s t=%d o=%s v=%s u=%s\n",
@@ -58,7 +47,7 @@ main (int argc, char *argv[])
item->validity, item->name);
gpgme_trust_item_unref (item);
}
- if (err != GPGME_EOF)
+ if (gpg_err_code (err) != GPG_ERR_EOF)
fail_if_err (err);
gpgme_release (ctx);
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index df0c9dfd..74d333f4 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -24,18 +24,7 @@
#include <gpgme.h>
-
-#define fail_if_err(err) \
- do \
- { \
- if (err) \
- { \
- fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
- __FILE__, __LINE__, gpgme_strerror (err)); \
- exit (1); \
- } \
- } \
- while (0)
+#include "t-support.h"
static const char test_text1[] = "Just GNU it!\n";
@@ -106,10 +95,10 @@ check_result (gpgme_verify_result_t result, int summary, char *fpr,
__FILE__, __LINE__, sig->fpr);
exit (1);
}
- if (sig->status != status)
+ if (gpg_err_code (sig->status) != status)
{
fprintf (stderr, "%s:%i: Unexpected signature status: %s\n",
- __FILE__, __LINE__, gpgme_strerror (sig->status));
+ __FILE__, __LINE__, gpg_strerror (sig->status));
exit (1);
}
if (notation)
@@ -145,7 +134,7 @@ check_result (gpgme_verify_result_t result, int summary, char *fpr,
__FILE__, __LINE__, sig->validity);
exit (1);
}
- if (sig->validity_reason != GPGME_No_Error)
+ if (gpg_err_code (sig->validity_reason) != GPG_ERR_NO_ERROR)
{
fprintf (stderr, "%s:%i: Unexpected validity reason: %s\n",
__FILE__, __LINE__, gpgme_strerror (sig->validity_reason));
@@ -174,7 +163,7 @@ main (int argc, char *argv[])
fail_if_err (err);
result = gpgme_op_verify_result (ctx);
check_result (result, 0, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
- GPGME_No_Error, 1);
+ GPG_ERR_NO_ERROR, 1);
/* Checking a manipulated message. */
gpgme_data_release (text);
@@ -185,7 +174,7 @@ main (int argc, char *argv[])
fail_if_err (err);
result = gpgme_op_verify_result (ctx);
check_result (result, GPGME_SIGSUM_RED, "2D727CC768697734",
- GPGME_Bad_Signature, 0);
+ GPG_ERR_BAD_SIGNATURE, 0);
/* Checking a normal signature. */
gpgme_data_release (sig);
@@ -198,7 +187,7 @@ main (int argc, char *argv[])
fail_if_err (err);
result = gpgme_op_verify_result (ctx);
check_result (result, 0, "A0FF4590BB6122EDEF6E3C542D727CC768697734",
- GPGME_No_Error, 0);
+ GPG_ERR_NO_ERROR, 0);
gpgme_data_release (sig);
gpgme_data_release (text);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 06:02:03 +0000