aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg
diff options
context:
space:
mode:
Diffstat (limited to 'tests/gpg')
-rw-r--r--tests/gpg/t-decrypt-verify.c20
-rw-r--r--tests/gpg/t-decrypt.c36
-rw-r--r--tests/gpg/t-edit.c16
-rw-r--r--tests/gpg/t-encrypt-sign.c42
-rw-r--r--tests/gpg/t-encrypt-sym.c20
-rw-r--r--tests/gpg/t-encrypt.c42
-rw-r--r--tests/gpg/t-eventloop.c28
-rw-r--r--tests/gpg/t-export.c26
-rw-r--r--tests/gpg/t-keylist.c2
-rw-r--r--tests/gpg/t-sign.c42
-rw-r--r--tests/gpg/t-signers.c30
-rw-r--r--tests/gpg/t-verify.c20
12 files changed, 172 insertions, 152 deletions
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 0c85d1be..276f7e6d 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -42,21 +42,23 @@ struct passphrase_cb_info_s
exit (1); } \
} while(0)
+
static void
print_data (GpgmeData dh)
{
char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind (dh);
- fail_if_err (err);
- while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
- fwrite ( buf, nread, 1, stdout );
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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 const char *
passphrase_cb (void *opaque, const char *desc, void **r_hd)
{
diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c
index 6b21d416..0eda6acd 100644
--- a/tests/gpg/t-decrypt.c
+++ b/tests/gpg/t-decrypt.c
@@ -42,19 +42,33 @@ struct passphrase_cb_info_s {
} while(0)
static void
-print_data ( GpgmeData dh )
+print_op_info (GpgmeCtx ctx)
{
- char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind ( dh );
- fail_if_err (err);
- while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
- fwrite ( buf, nread, 1, stdout );
+ char *str = gpgme_get_op_info (ctx, 0);
+
+ if (!str)
+ puts ("<!-- no operation info available -->");
+ else
+ {
+ puts (str);
+ free (str);
}
- if (err != GPGME_EOF)
- fail_if_err (err);
+}
+
+
+static void
+print_data (GpgmeData 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);
}
diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c
index 4a22955a..8117d587 100644
--- a/tests/gpg/t-edit.c
+++ b/tests/gpg/t-edit.c
@@ -45,13 +45,15 @@ static void
flush_data (GpgmeData dh)
{
char buf[100];
- size_t nread;
- GpgmeError err;
-
- while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
- fwrite (buf, nread, 1, stdout);
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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);
}
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index b92d74c8..1517db0f 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -33,33 +33,33 @@
} while(0)
static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
{
- char *s = gpgme_get_op_info (c, 0);
-
- if (!s)
- puts ("<!-- no operation info available -->");
- else {
- puts (s);
- free (s);
+ char *str = gpgme_get_op_info (ctx, 0);
+
+ if (!str)
+ puts ("<!-- no operation info available -->");
+ else
+ {
+ puts (str);
+ free (str);
}
}
static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
{
- char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind ( dh );
- fail_if_err (err);
- while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
- fwrite ( buf, nread, 1, stdout );
- }
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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);
}
@@ -92,7 +92,7 @@ main (int argc, char **argv )
GpgmeRecipients rset;
char *p;
- err = gpgme_check_engine ();
+ err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
fail_if_err (err);
puts ( gpgme_get_engine_info() );
diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 441f747f..db3f3e9e 100644
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -36,15 +36,15 @@ static void
print_data (GpgmeData dh)
{
char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind (dh);
- fail_if_err (err);
- while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
- fwrite ( buf, nread, 1, stdout );
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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);
}
@@ -79,7 +79,7 @@ main (int argc, char **argv)
char *p;
size_t len;
- err = gpgme_check_engine ();
+ err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
fail_if_err (err);
do
diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 06736b3a..14a407d9 100644
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -35,44 +35,44 @@
static void
print_op_info (GpgmeCtx c)
{
- char *s = gpgme_get_op_info (c, 0);
-
- if (!s)
- puts ("<!-- no operation info available -->");
- else {
- puts (s);
- free (s);
+ char *s = gpgme_get_op_info (c, 0);
+
+ if (!s)
+ puts ("<!-- no operation info available -->");
+ else
+ {
+ puts (s);
+ free (s);
}
}
static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
{
- char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind ( dh );
- fail_if_err (err);
- while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
- fwrite ( buf, nread, 1, stdout );
- }
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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);
}
int
-main (int argc, char **argv )
+main (int argc, char **argv)
{
GpgmeCtx ctx;
GpgmeError err;
GpgmeData in, out;
GpgmeRecipients rset;
- err = gpgme_check_engine ();
+ err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
fail_if_err (err);
puts ( gpgme_get_engine_info() );
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 634911af..887de64c 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -37,14 +37,14 @@
static void
print_op_info (GpgmeCtx ctx)
{
- char *s = gpgme_get_op_info (ctx, 0);
+ char *str = gpgme_get_op_info (ctx, 0);
- if (!s)
+ if (!str)
puts ("<!-- no operation info available -->");
else
{
- puts (s);
- free (s);
+ puts (str);
+ free (str);
}
}
@@ -53,15 +53,15 @@ static void
print_data (GpgmeData dh)
{
char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind (dh);
- fail_if_err (err);
- while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
- fwrite (buf, nread, 1, stdout);
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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);
}
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
for (i = 0; i < FDLIST_MAX; i++)
fdlist[i].fd = -1;
- err = gpgme_check_engine ();
+ err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
fail_if_err (err);
puts (gpgme_get_engine_info ());
diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index 373e9f5c..dbcdd884 100644
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -32,24 +32,22 @@
exit (1); } \
} while(0)
+
static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
{
- char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind ( dh );
- fail_if_err (err);
- while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
- fwrite ( buf, nread, 1, stdout );
- }
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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);
}
-
-
int
main (int argc, char **argv )
{
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index d77cd702..24edef50 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -149,7 +149,7 @@ main (int argc, char **argv)
}
pattern = argc? *argv : NULL;
- err = gpgme_check_engine();
+ err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
fail_if_err (err);
err = gpgme_new (&ctx);
diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c
index 0e5f5c36..9caaf696 100644
--- a/tests/gpg/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -33,34 +33,36 @@
} while(0)
static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
{
- char *s = gpgme_get_op_info (c, 0);
-
- if (!s)
- puts ("<!-- no operation info available -->");
- else {
- puts (s);
- free (s);
+ char *str = gpgme_get_op_info (ctx, 0);
+
+ if (!str)
+ puts ("<!-- no operation info available -->");
+ else
+ {
+ puts (str);
+ free (str);
}
}
+
static void
-print_data ( GpgmeData dh )
+print_data (GpgmeData dh)
{
- char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind ( dh );
- fail_if_err (err);
- while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) {
- fwrite ( buf, nread, 1, stdout );
- }
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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 const char *
passphrase_cb ( void *opaque, const char *desc, void **r_hd )
{
diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c
index d0aa00b3..2e8d3f41 100644
--- a/tests/gpg/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -33,34 +33,36 @@
} while(0)
static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
{
- char *s = gpgme_get_op_info (c, 0);
+ char *str = gpgme_get_op_info (ctx, 0);
- if (!s)
+ if (!str)
puts ("<!-- no operation info available -->");
else
{
- puts (s);
- free (s);
+ puts (str);
+ free (str);
}
}
+
static void
print_data (GpgmeData dh)
{
char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind (dh);
- fail_if_err (err);
- while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
- fwrite (buf, nread, 1, stdout);
- if (err != GPGME_EOF)
- fail_if_err (err);
+ 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 const char *
passphrase_cb (void *opaque, const char *desc, void **r_hd)
{
diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 13eca934..f12b6068 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -188,25 +188,25 @@ main (int argc, char **argv )
fail_if_err (err);
puts ("checking a valid message:\n");
- err = gpgme_op_verify (ctx, sig, text, &status );
+ err = gpgme_op_verify (ctx, sig, text, NULL, &status);
fail_if_err (err);
- print_sig_stat ( ctx, status );
+ print_sig_stat (ctx, status);
if (status != GPGME_SIG_STAT_GOOD)
{
fprintf (stderr, "%s:%d: Wrong sig stat\n", __FILE__, __LINE__);
exit (1);
}
- if ( (nota=gpgme_get_notation (ctx)) )
+ if ((nota = gpgme_get_notation (ctx)))
printf ("---Begin Notation---\n%s---End Notation---\n", nota );
puts ("checking a manipulated message:\n");
gpgme_data_release (text);
- err = gpgme_data_new_from_mem ( &text,
- test_text1f, strlen (test_text1f), 0 );
+ err = gpgme_data_new_from_mem (&text,
+ test_text1f, strlen (test_text1f), 0);
fail_if_err (err);
- gpgme_data_rewind ( sig );
- err = gpgme_op_verify (ctx, sig, text, &status );
+ gpgme_data_rewind (sig);
+ err = gpgme_op_verify (ctx, sig, text, NULL, &status);
fail_if_err (err);
print_sig_stat (ctx, status);
@@ -215,17 +215,17 @@ main (int argc, char **argv )
fprintf (stderr, "%s:%d: Wrong sig stat\n", __FILE__, __LINE__);
exit (1);
}
- if ( (nota=gpgme_get_notation (ctx)) )
+ if ((nota = gpgme_get_notation (ctx)))
printf ("---Begin Notation---\n%s---End Notation---\n", nota );
puts ("checking a normal signature:");
gpgme_data_release (sig);
gpgme_data_release (text);
- err = gpgme_data_new_from_mem (&sig, test_sig2, strlen (test_sig2), 0);
+ err = gpgme_data_new_from_mem (&sig, test_sig2, strlen (test_sig2), 0);
fail_if_err (err);
err = gpgme_data_new (&text);
fail_if_err (err);
- err = gpgme_op_verify (ctx, sig, text, &status);
+ err = gpgme_op_verify (ctx, sig, NULL, text, &status);
fail_if_err (err);
nota = gpgme_data_release_and_get_mem (text, &len);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 21:06:04 +0000