From 02536bb72b884dceeaadda9364860f0649450e2e Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 5 Jun 2003 23:20:29 +0000 Subject: doc/ 2003-06-06 Marcus Brinkmann * gpgme.texi: Change error codes to GPG_ERR_* variants. (Error Handling): Rewritten. gpgme/ 2003-06-05 Marcus Brinkmann Everywhere: Use libgpg-error error codes. * Makefile.am (EXTRA_DIST): Remove mkerrors. (BUILT_SOURCES): Remove errors.c. (MOSTLYCLEANFILES): Likewise. (libgpgme_la_SOURCES): Likewise. Add error.c. (errors.c): Remove target. * mkerrors: File removed. * error.c: New file. * gpgme.h (gpgme_error_t): Change to type gpg_error_t. (gpgme_err_code_t, gpgme_err_source_t): New types. (gpgme_err_code, gpgme_err_source, gpgme_error, gpgme_err_make): New static inline functions. (gpgme_strsource, gpgme_err_code_from_errno, gpgme_err_code_to_errno, gpgme_err_make_from_errno, gpgme_error_from_errno): New prototypes. tests/ 2003-06-06 Marcus Brinkmann Everywhere: Use libgpg-error error codes. * gpg/Makefile.am (noinst_HEADERS): New variable. * gpg/t-support.h: New file. * gpgsm/Makefile.am (noinst_HEADERS): New variable. * gpgsm/t-support.h: New file. --- tests/gpgsm/Makefile.am | 4 ++- tests/gpgsm/t-decrypt.c | 25 +-------------- tests/gpgsm/t-encrypt.c | 30 +----------------- tests/gpgsm/t-export.c | 29 +----------------- tests/gpgsm/t-genkey.c | 32 ++----------------- tests/gpgsm/t-keylist.c | 2 +- tests/gpgsm/t-sign.c | 32 ++----------------- tests/gpgsm/t-support.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/gpgsm/t-verify.c | 8 ++--- 9 files changed, 96 insertions(+), 147 deletions(-) create mode 100644 tests/gpgsm/t-support.h (limited to 'tests/gpgsm') diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am index 85ea1c83..fa132346 100644 --- a/tests/gpgsm/Makefile.am +++ b/tests/gpgsm/Makefile.am @@ -23,9 +23,11 @@ GPGSM = @GPGSM@ TESTS_ENVIRONMENT = GNUPGHOME=. +noinst_HEADERS = t-support.h TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export -EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der $(key_id) +EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \ + $(key_id) INCLUDES = -I$(top_srcdir)/gpgme diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c index f3dc976d..21d6bd14 100644 --- a/tests/gpgsm/t-decrypt.c +++ b/tests/gpgsm/t-decrypt.c @@ -24,6 +24,7 @@ #include #include +#include "t-support.h" static const char test_text1[] = "Hallo Leute!\n"; @@ -39,30 +40,6 @@ static const char test_cip1[] = "BAiiytWtOSmqnwAA\n" "-----END CMS OBJECT-----\n"; -#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) - -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); -} - int main (int argc, char *argv[]) diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c index 5f8916f7..247f1ca9 100644 --- a/tests/gpgsm/t-encrypt.c +++ b/tests/gpgsm/t-encrypt.c @@ -24,35 +24,7 @@ #include -#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) diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c index 3d536ad4..a2355e0c 100644 --- a/tests/gpgsm/t-export.c +++ b/tests/gpgsm/t-export.c @@ -24,34 +24,7 @@ #include #include - -#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 diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c index d5df2c61..8b08a65b 100644 --- a/tests/gpgsm/t-genkey.c +++ b/tests/gpgsm/t-genkey.c @@ -24,35 +24,7 @@ #include #include - -#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" /* True if progress function printed something on the screen. */ @@ -79,7 +51,7 @@ progress (void *self, const char *what, int type, int current, int total) int -main (int argc, char **argv) +main (int argc, char *argv[]) { gpgme_ctx_t ctx; gpgme_error_t err; diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c index 215f1e44..7e596283 100644 --- a/tests/gpgsm/t-keylist.c +++ b/tests/gpgsm/t-keylist.c @@ -335,7 +335,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/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c index 3c557cfa..fbd72f1a 100644 --- a/tests/gpgsm/t-sign.c +++ b/tests/gpgsm/t-sign.c @@ -23,35 +23,7 @@ #include #include - -#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" static void @@ -102,7 +74,7 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type) int -main (int argc, char **argv) +main (int argc, char *argv[]) { gpgme_ctx_t ctx; gpgme_error_t err; diff --git a/tests/gpgsm/t-support.h b/tests/gpgsm/t-support.h new file mode 100644 index 00000000..c6470515 --- /dev/null +++ b/tests/gpgsm/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 +#include + +#include + +#define fail_if_err(err) \ + do \ + { \ + if (err) \ + { \ + fprintf (stderr, "%s:%d: %s: %s\n", \ + __FILE__, __LINE__, gpg_strsource (err), \ + gpg_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 (gpg_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 (gpg_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/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c index de36073b..be61cbb2 100644 --- a/tests/gpgsm/t-verify.c +++ b/tests/gpgsm/t-verify.c @@ -78,7 +78,7 @@ 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)); @@ -102,7 +102,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)); @@ -133,7 +133,7 @@ main (int argc, char **argv) result = gpgme_op_verify_result (ctx); check_result (result, GPGME_SIGSUM_VALID | GPGME_SIGSUM_GREEN, "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E", - GPGME_No_Error, GPGME_VALIDITY_FULL); + GPG_ERR_NO_ERROR, GPGME_VALIDITY_FULL); /* Checking a manipulated message. */ gpgme_data_release (text); @@ -145,7 +145,7 @@ main (int argc, char **argv) result = gpgme_op_verify_result (ctx); check_result (result, GPGME_SIGSUM_RED, "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E", - GPGME_Bad_Signature, GPGME_VALIDITY_UNKNOWN); + GPG_ERR_BAD_SIGNATURE, GPGME_VALIDITY_UNKNOWN); gpgme_release (ctx); return 0; -- cgit v1.2.3