aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpgsm
diff options
context:
space:
mode:
Diffstat (limited to 'tests/gpgsm')
-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
5 files changed, 78 insertions, 79 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-18 22:25:25 +0000