aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/ChangeLog24
-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
-rw-r--r--tests/gpgsm/t-decrypt.c24
-rw-r--r--tests/gpgsm/t-encrypt.c41
-rw-r--r--tests/gpgsm/t-export.c24
-rw-r--r--tests/gpgsm/t-sign.c42
-rw-r--r--tests/gpgsm/t-verify.c26
-rw-r--r--tests/t-data.c67
19 files changed, 289 insertions, 283 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 770b4b54..3ef332ad 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,27 @@
+2002-10-09 Marcus Brinkmann <[email protected]>
+
+ * gpg/t-decrypt.c (print_data): Update to new gpgme_data_read
+ interface, and use gpgme_engine_check_version instead
+ gpgme_check_version.
+ * gpg/t-decrypt-verify.c (print_data): Likewise.
+ * gpg/t-edit.c (main): Likewise.
+ * gpg/t-encrypt.c (print_data): Likewise.
+ * gpg/t-encrypt-sign.c (print_data): Likewise.
+ * gpg/t-encrypt-sym.c (print_data): Likewise.
+ * gpg/t-eventloop.c (print_data): Likewise.
+ * gpg/t-export.c (print_data): Likewise.
+ * gpg/t-sign.c (print_data): Likewise.
+ * gpg/t-signers.c (print_data): Likewise.
+ * gpgsm/t-decrypt.c (print_data): Likewise.
+ * gpgsm/t-encrypt.c (print_data): Likewise.
+ * gpgsm/t-export.c (print_data): Likewise.
+ * gpgsm/t-sign.c (print_data): Likewise.
+ * gpg/t-verify.c (main): Likewise for gpgme_op_verify.
+ * gpgsm/t-verify.c (main): Likewise for gpgme_op_verify.
+ * t-data.c (read_once_test): Likewise.
+ (write_test): Update for new behaviour of data objects.
+ (main): Remove type test.
+
2002-09-30 Werner Koch <[email protected]>
* gpgsm/t-keylist.c (doit): Add arg SECRET.
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);
diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c
index 212fcf8f..7b8e186b 100644
--- a/tests/gpgsm/t-decrypt.c
+++ b/tests/gpgsm/t-decrypt.c
@@ -49,21 +49,21 @@ static const char test_cip1[] =
} 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/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 9a7358c2..54096245 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -33,37 +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);
}
-
int
main (int argc, char **argv )
{
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index a5f9e731..dd2ac548 100644
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -33,23 +33,21 @@
} 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/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c
index 5d544755..b4c8332e 100644
--- a/tests/gpgsm/t-sign.c
+++ b/tests/gpgsm/t-sign.c
@@ -33,36 +33,38 @@
} 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)
- puts ("<!-- no operation info available -->");
- else {
- puts (s);
- free (s);
+ 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);
}
+
int
-main (int argc, char **argv )
+main (int argc, char **argv)
{
GpgmeCtx ctx;
GpgmeError err;
diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index f65a83b6..715b3473 100644
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -186,33 +186,33 @@ main (int argc, char **argv )
fail_if_err (err);
puts ("checking a valid message:\n");
- err = gpgme_op_verify (ctx, sig, text, &status );
- print_sig_stat ( ctx, status );
- print_sig_stat ( ctx, status );
- print_sig_stat ( ctx, status );
- print_sig_stat ( ctx, status );
+ err = gpgme_op_verify (ctx, sig, text, NULL, &status);
+ print_sig_stat (ctx, status);
+ print_sig_stat (ctx, status);
+ print_sig_stat (ctx, status);
+ print_sig_stat (ctx, status);
fail_if_err (err);
if ( (nota=gpgme_get_notation (ctx)) )
- printf ("---Begin Notation---\n%s---End Notation---\n", nota );
+ 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 );
+ test_text1f, strlen (test_text1f), 0);
fail_if_err (err);
gpgme_data_rewind ( sig );
- err = gpgme_op_verify (ctx, sig, text, &status );
+ err = gpgme_op_verify (ctx, sig, text, NULL, &status);
- print_sig_stat ( ctx, status );
+ print_sig_stat (ctx, status);
fail_if_err (err);
- if ( (nota=gpgme_get_notation (ctx)) )
- printf ("---Begin Notation---\n%s---End Notation---\n", nota );
+ if ((nota=gpgme_get_notation (ctx)))
+ printf ("---Begin Notation---\n%s---End Notation---\n", nota);
gpgme_data_release (sig);
gpgme_data_release (text);
-
-} while ( argc > 1 && !strcmp( argv[1], "--loop" ) && ++n < 20 );
+
+ } while ( argc > 1 && !strcmp( argv[1], "--loop" ) && ++n < 20 );
gpgme_release (ctx);
return 0;
diff --git a/tests/t-data.c b/tests/t-data.c
index f3c769f6..3135dbdc 100644
--- a/tests/t-data.c
+++ b/tests/t-data.c
@@ -106,12 +106,10 @@ read_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
void
read_once_test (round_t round, GpgmeData data)
{
- GpgmeError err;
char buffer[1024];
size_t read;
- err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
- fail_if_err (err);
+ read = gpgme_data_read (data, buffer, sizeof (buffer));
if (read != strlen (text) || strncmp (buffer, text, strlen (text)))
{
@@ -120,8 +118,8 @@ read_once_test (round_t round, GpgmeData data)
exit (1);
}
- err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
- if (err != GPGME_EOF)
+ read = gpgme_data_read (data, buffer, sizeof (buffer));
+ if (read)
{
fprintf (stderr, "%s:%d: (%i) gpgme_data_read did not signal EOF\n",
__FILE__, __LINE__, round);
@@ -138,8 +136,8 @@ read_test (round_t round, GpgmeData data)
if (round == TEST_INOUT_NONE)
{
- err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
- if (!err)
+ read = gpgme_data_read (data, buffer, sizeof (buffer));
+ if (read > 0)
{
fprintf (stderr, "%s:%d: (%i) gpgme_data_read succeded unexpectedly\n",
__FILE__, __LINE__, round);
@@ -159,12 +157,12 @@ write_test (round_t round, GpgmeData data)
{
GpgmeError err;
char buffer[1024];
- size_t read;
+ size_t amt;
- err = gpgme_data_write (data, text, strlen (text));
- fail_if_err (err);
+ amt = gpgme_data_write (data, text, strlen (text));
+ if (amt != strlen (text))
+ fail_if_err (GPGME_File_Error);
- read_once_test (round, data);
err = gpgme_data_rewind (data);
fail_if_err (err);
@@ -172,18 +170,17 @@ write_test (round_t round, GpgmeData data)
read_once_test (round, data);
else
{
- err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
- fail_if_err (err);
+ amt = gpgme_data_read (data, buffer, sizeof (buffer));
- if (read != strlen (text2) || strncmp (buffer, text2, strlen (text2)))
+ if (amt != strlen (text2) || strncmp (buffer, text2, strlen (text2)))
{
fprintf (stderr, "%s:%d: (%i) gpgme_data_read returned wrong data\n",
__FILE__, __LINE__, round);
exit (1);
}
- err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
- if (err != GPGME_EOF)
+ amt = gpgme_data_read (data, buffer, sizeof (buffer));
+ if (amt)
{
fprintf (stderr, "%s:%d: (%i) gpgme_data_read did not signal EOF\n",
__FILE__, __LINE__, round);
@@ -193,7 +190,7 @@ write_test (round_t round, GpgmeData data)
}
int
-main (int argc, char **argv )
+main (int argc, char **argv)
{
round_t round = TEST_INITIALIZER;
const char *text_filename = make_filename ("t-data-1.txt");
@@ -214,12 +211,6 @@ main (int argc, char **argv )
"unexpectedly\n", __FILE__, __LINE__);
exit (1);
}
- if (gpgme_data_get_type (NULL) != GPGME_DATA_TYPE_NONE)
- {
- fprintf (stderr, "%s:%d: gpgme_data_get_type on NULL incorrect\n",
- __FILE__, __LINE__);
- exit (1);
- }
continue;
case TEST_INOUT_NONE:
err = gpgme_data_new (&data);
@@ -245,7 +236,7 @@ main (int argc, char **argv )
case TEST_INOUT_MEM_FROM_FILE_NO_COPY:
err = gpgme_data_new_from_file (&data, text_filename, 0);
/* This is not implemented yet. */
- if (err == GPGME_Not_Implemented)
+ if (err == GPGME_Not_Implemented || err == GPGME_Invalid_Value)
continue;
break;
case TEST_INOUT_MEM_FROM_FILE_PART_BY_NAME:
@@ -287,34 +278,6 @@ main (int argc, char **argv )
}
fail_if_err (err);
- switch (round)
- {
- case TEST_INOUT_NONE:
- if (gpgme_data_get_type (data) != GPGME_DATA_TYPE_NONE)
- err = GPGME_Invalid_Type;
- break;
- case TEST_INOUT_MEM_NO_COPY:
- case TEST_INOUT_MEM_COPY:
- case TEST_INOUT_MEM_FROM_FILE_COPY:
- case TEST_INOUT_MEM_FROM_FILE_NO_COPY:
- case TEST_INOUT_MEM_FROM_FILE_PART_BY_NAME:
- case TEST_INOUT_MEM_FROM_FILE_PART_BY_FP:
- if (gpgme_data_get_type (data) != GPGME_DATA_TYPE_MEM)
- err = GPGME_Invalid_Type;
- break;
- case TEST_OUT_CB:
- if (gpgme_data_get_type (data) != GPGME_DATA_TYPE_CB)
- err = GPGME_Invalid_Type;
- break;
- case TEST_INITIALIZER:
- case TEST_INVALID_ARGUMENT:
- case TEST_INOUT_MEM_FROM_INEXISTANT_FILE:
- case TEST_INOUT_MEM_FROM_INEXISTANT_FILE_PART:
- case TEST_END:
- /* Shouldn't happen. */
- fprintf (stderr, "%s:%d: impossible condition\n", __FILE__, __LINE__);
- exit (1);
- }
read_test (round, data);
if (round != TEST_OUT_CB)
write_test (round, data);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 08:45:42 +0000