aboutsummaryrefslogtreecommitdiffstats
path: root/trunk/tests/gpgsm
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/tests/gpgsm')
-rw-r--r--trunk/tests/gpgsm/t-decrypt.c12
-rw-r--r--trunk/tests/gpgsm/t-encrypt.c14
-rw-r--r--trunk/tests/gpgsm/t-export.c12
-rw-r--r--trunk/tests/gpgsm/t-genkey.c12
-rw-r--r--trunk/tests/gpgsm/t-import.c12
-rw-r--r--trunk/tests/gpgsm/t-keylist.c10
-rw-r--r--trunk/tests/gpgsm/t-sign.c16
-rw-r--r--trunk/tests/gpgsm/t-verify.c18
8 files changed, 53 insertions, 53 deletions
diff --git a/trunk/tests/gpgsm/t-decrypt.c b/trunk/tests/gpgsm/t-decrypt.c
index 499d82e3..f3dc976d 100644
--- a/trunk/tests/gpgsm/t-decrypt.c
+++ b/trunk/tests/gpgsm/t-decrypt.c
@@ -40,7 +40,7 @@ static const char test_cip1[] =
"-----END CMS OBJECT-----\n";
#define fail_if_err(a) do { if(a) { int my_errno = errno; \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ 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)); \
@@ -48,7 +48,7 @@ static const char test_cip1[] =
} while(0)
static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
{
#define BUF_SIZE 512
char buf[BUF_SIZE + 1];
@@ -67,10 +67,10 @@ print_data (GpgmeData dh)
int
main (int argc, char *argv[])
{
- GpgmeCtx ctx;
- GpgmeError err;
- GpgmeData in, out;
- GpgmeDecryptResult result;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t in, out;
+ gpgme_decrypt_result_t result;
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpgsm/t-encrypt.c b/trunk/tests/gpgsm/t-encrypt.c
index 0783a9c6..1daa7720 100644
--- a/trunk/tests/gpgsm/t-encrypt.c
+++ b/trunk/tests/gpgsm/t-encrypt.c
@@ -29,7 +29,7 @@
{ \
if (err) \
{ \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); \
} \
@@ -38,7 +38,7 @@
static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
{
#define BUF_SIZE 512
char buf[BUF_SIZE + 1];
@@ -57,11 +57,11 @@ print_data (GpgmeData dh)
int
main (int argc, char **argv)
{
- GpgmeCtx ctx;
- GpgmeError err;
- GpgmeData in, out;
- GpgmeRecipients rset;
- GpgmeEncryptResult result;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t in, out;
+ gpgme_recipients_t rset;
+ gpgme_encrypt_result_t result;
err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
fail_if_err (err);
diff --git a/trunk/tests/gpgsm/t-export.c b/trunk/tests/gpgsm/t-export.c
index dd2ac548..b83c060d 100644
--- a/trunk/tests/gpgsm/t-export.c
+++ b/trunk/tests/gpgsm/t-export.c
@@ -27,13 +27,13 @@
#include <gpgme.h>
#define fail_if_err(a) do { if(a) { \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror(a)); \
exit (1); } \
} while(0)
static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
{
char buf[100];
int ret;
@@ -51,10 +51,10 @@ print_data (GpgmeData dh)
int
main (int argc, char **argv )
{
- GpgmeCtx ctx;
- GpgmeError err;
- GpgmeData out;
- GpgmeRecipients rset;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t out;
+ gpgme_recipients_t rset;
do {
err = gpgme_new (&ctx);
diff --git a/trunk/tests/gpgsm/t-genkey.c b/trunk/tests/gpgsm/t-genkey.c
index a7530bae..d5df2c61 100644
--- a/trunk/tests/gpgsm/t-genkey.c
+++ b/trunk/tests/gpgsm/t-genkey.c
@@ -30,7 +30,7 @@
{ \
if (err) \
{ \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); \
} \
@@ -39,7 +39,7 @@
static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
{
#define BUF_SIZE 512
char buf[BUF_SIZE + 1];
@@ -81,16 +81,16 @@ progress (void *self, const char *what, int type, int current, int total)
int
main (int argc, char **argv)
{
- GpgmeCtx ctx;
- GpgmeError err;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
const char *parms = "<GnupgKeyParms format=\"internal\">\n"
"Key-Type: RSA\n"
"Key-Length: 1024\n"
"Name-DN: C=de,O=g10 code,OU=Testlab,CN=Joe 2 Tester\n"
"Name-Email: [email protected]\n"
"</GnupgKeyParms>\n";
- GpgmeGenKeyResult result;
- GpgmeData certreq;
+ gpgme_genkey_result_t result;
+ gpgme_data_t certreq;
err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
fail_if_err (err);
diff --git a/trunk/tests/gpgsm/t-import.c b/trunk/tests/gpgsm/t-import.c
index 219ce95b..2b50e10e 100644
--- a/trunk/tests/gpgsm/t-import.c
+++ b/trunk/tests/gpgsm/t-import.c
@@ -31,7 +31,7 @@
{ \
if (err) \
{ \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); \
} \
@@ -62,7 +62,7 @@ make_filename (const char *fname)
void
-check_result (GpgmeImportResult result, char *fpr, int total)
+check_result (gpgme_import_result_t result, char *fpr, int total)
{
if (result->considered != total)
{
@@ -154,10 +154,10 @@ check_result (GpgmeImportResult result, char *fpr, int total)
int
main (int argc, char **argv)
{
- GpgmeCtx ctx;
- GpgmeError err;
- GpgmeData in;
- GpgmeImportResult result;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t in;
+ gpgme_import_result_t result;
const char *cert_1 = make_filename ("cert_dfn_pca01.der");
const char *cert_2 = make_filename ("cert_dfn_pca15.der");
diff --git a/trunk/tests/gpgsm/t-keylist.c b/trunk/tests/gpgsm/t-keylist.c
index 704776f9..215f1e44 100644
--- a/trunk/tests/gpgsm/t-keylist.c
+++ b/trunk/tests/gpgsm/t-keylist.c
@@ -30,7 +30,7 @@
{ \
if (err) \
{ \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); \
} \
@@ -76,10 +76,10 @@ keys[] =
int
main (int argc, char **argv)
{
- GpgmeError err;
- GpgmeCtx ctx;
- GpgmeKey key;
- GpgmeKeyListResult result;
+ gpgme_error_t err;
+ gpgme_ctx_t ctx;
+ gpgme_key_t key;
+ gpgme_keylist_result_t result;
int i = 0;
err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
diff --git a/trunk/tests/gpgsm/t-sign.c b/trunk/tests/gpgsm/t-sign.c
index a9af38fb..3c557cfa 100644
--- a/trunk/tests/gpgsm/t-sign.c
+++ b/trunk/tests/gpgsm/t-sign.c
@@ -29,7 +29,7 @@
{ \
if (err) \
{ \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); \
} \
@@ -38,7 +38,7 @@
static void
-print_data (GpgmeData dh)
+print_data (gpgme_data_t dh)
{
#define BUF_SIZE 512
char buf[BUF_SIZE + 1];
@@ -55,7 +55,7 @@ print_data (GpgmeData dh)
static void
-check_result (GpgmeSignResult result, GpgmeSigMode type)
+check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
{
if (result->invalid_signers)
{
@@ -104,10 +104,10 @@ check_result (GpgmeSignResult result, GpgmeSigMode type)
int
main (int argc, char **argv)
{
- GpgmeCtx ctx;
- GpgmeError err;
- GpgmeData in, out;
- GpgmeSignResult result;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t in, out;
+ gpgme_sign_result_t result;
err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
fail_if_err (err);
@@ -133,7 +133,7 @@ main (int argc, char **argv)
gpgme_data_release (out);
/* Now a detached signature. */
- gpgme_data_rewind (in);
+ gpgme_data_seek (in, 0, SEEK_SET);
err = gpgme_data_new (&out);
fail_if_err (err);
err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_DETACH);
diff --git a/trunk/tests/gpgsm/t-verify.c b/trunk/tests/gpgsm/t-verify.c
index 48e0ce96..de36073b 100644
--- a/trunk/tests/gpgsm/t-verify.c
+++ b/trunk/tests/gpgsm/t-verify.c
@@ -30,7 +30,7 @@
{ \
if (err) \
{ \
- fprintf (stderr, "%s:%d: GpgmeError %s\n", \
+ fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
__FILE__, __LINE__, gpgme_strerror (err)); \
exit (1); \
} \
@@ -54,10 +54,10 @@ static const char test_sig1[] =
static void
-check_result (GpgmeVerifyResult result, int summary, char *fpr,
- GpgmeError status, GpgmeValidity validity)
+check_result (gpgme_verify_result_t result, int summary, char *fpr,
+ gpgme_error_t status, gpgme_validity_t validity)
{
- GpgmeSignature sig;
+ gpgme_signature_t sig;
sig = result->signatures;
if (!sig || sig->next)
@@ -114,10 +114,10 @@ check_result (GpgmeVerifyResult result, int summary, char *fpr,
int
main (int argc, char **argv)
{
- GpgmeCtx ctx;
- GpgmeError err;
- GpgmeData sig, text;
- GpgmeVerifyResult result;
+ gpgme_ctx_t ctx;
+ gpgme_error_t err;
+ gpgme_data_t sig, text;
+ gpgme_verify_result_t result;
err = gpgme_new (&ctx);
fail_if_err (err);
@@ -139,7 +139,7 @@ main (int argc, char **argv)
gpgme_data_release (text);
err = gpgme_data_new_from_mem (&text, test_text1f, strlen (test_text1f), 0);
fail_if_err (err);
- gpgme_data_rewind (sig);
+ gpgme_data_seek (sig, 0, SEEK_SET);
err = gpgme_op_verify (ctx, sig, text, NULL);
fail_if_err (err);
result = gpgme_op_verify_result (ctx);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-19 11:48:11 +0000