diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/t-encrypt.c | 28 | ||||
| -rw-r--r-- | tests/t-keylist.c | 8 | ||||
| -rw-r--r-- | tests/t-verify.c | 22 |
3 files changed, 29 insertions, 29 deletions
diff --git a/tests/t-encrypt.c b/tests/t-encrypt.c index d99beff0..88ceaeee 100644 --- a/tests/t-encrypt.c +++ b/tests/t-encrypt.c @@ -38,9 +38,9 @@ print_data ( GpgmeData dh ) size_t nread; GpgmeError err; - err = gpgme_rewind_data ( dh ); + err = gpgme_data_rewind ( dh ); fail_if_err (err); - while ( !(err = gpgme_read_data ( dh, buf, 100, &nread )) ) { + while ( !(err = gpgme_data_read ( dh, buf, 100, &nread )) ) { fwrite ( buf, nread, 1, stdout ); } if (err != GPGME_EOF) @@ -55,27 +55,27 @@ main (int argc, char **argv ) GpgmeCtx ctx; GpgmeError err; GpgmeData in, out; - GpgmeRecipientSet rset; + GpgmeRecipients rset; do { - err = gpgme_new_context (&ctx); + err = gpgme_new (&ctx); fail_if_err (err); - err = gpgme_new_data ( &in, "Hallo Leute\n", 12, 0 ); + err = gpgme_data_new ( &in, "Hallo Leute\n", 12, 0 ); fail_if_err (err); - err = gpgme_new_data ( &out, NULL, 0,0 ); + err = gpgme_data_new ( &out, NULL, 0,0 ); fail_if_err (err); - err = gpgme_new_recipient_set (&rset); + err = gpgme_recipients_new (&rset); fail_if_err (err); - err = gpgme_add_recipient (rset, "Bob"); + err = gpgme_recipients_add_name (rset, "Bob"); fail_if_err (err); - err = gpgme_add_recipient (rset, "Alpha"); + err = gpgme_recipients_add_name (rset, "Alpha"); fail_if_err (err); - err = gpgme_encrypt (ctx, rset, in, out ); + err = gpgme_op_encrypt (ctx, rset, in, out ); fail_if_err (err); fflush (NULL); @@ -83,10 +83,10 @@ main (int argc, char **argv ) print_data (out); fputs ("End Result.\n", stdout ); - gpgme_release_recipient_set (rset); - gpgme_release_data (in); - gpgme_release_data (out); - gpgme_release_context (ctx); + gpgme_recipients_release (rset); + gpgme_data_release (in); + gpgme_data_release (out); + gpgme_release (ctx); } while ( argc > 1 && !strcmp( argv[1], "--loop" ) ); return 0; diff --git a/tests/t-keylist.c b/tests/t-keylist.c index ba47d39c..249c21d7 100644 --- a/tests/t-keylist.c +++ b/tests/t-keylist.c @@ -37,10 +37,10 @@ doit ( GpgmeCtx ctx, const char *pattern ) GpgmeError err; GpgmeKey key; - err = gpgme_keylist_start (ctx, pattern, 0 ); + err = gpgme_op_keylist_start (ctx, pattern, 0 ); fail_if_err (err); - while ( !(err = gpgme_keylist_next ( ctx, &key )) ) { + while ( !(err = gpgme_op_keylist_next ( ctx, &key )) ) { printf ("Got key object (%p)\n", key ); } if ( err != GPGME_EOF ) @@ -66,12 +66,12 @@ main (int argc, char **argv ) } pattern = argc? *argv : NULL; - err = gpgme_new_context (&ctx); + err = gpgme_new (&ctx); fail_if_err (err); do { doit ( ctx, pattern ); } while ( loop ); - gpgme_release_context (ctx); + gpgme_release (ctx); return 0; } diff --git a/tests/t-verify.c b/tests/t-verify.c index 3a948afd..779d560f 100644 --- a/tests/t-verify.c +++ b/tests/t-verify.c @@ -51,32 +51,32 @@ main (int argc, char **argv ) GpgmeError err; GpgmeData sig, text; - err = gpgme_new_context (&ctx); + err = gpgme_new (&ctx); fail_if_err (err); do { - err = gpgme_new_data ( &text, test_text1, strlen (test_text1), 0 ); + err = gpgme_data_new ( &text, test_text1, strlen (test_text1), 0 ); fail_if_err (err); - err = gpgme_new_data ( &sig, test_sig1, strlen (test_sig1), 0 ); + err = gpgme_data_new ( &sig, test_sig1, strlen (test_sig1), 0 ); fail_if_err (err); puts ("checking a valid message:\n"); - err = gpgme_verify (ctx, sig, text ); + err = gpgme_op_verify (ctx, sig, text ); fail_if_err (err); puts ("checking a manipulated message:\n"); - gpgme_release_data (text); - err = gpgme_new_data ( &text, test_text1f, strlen (test_text1f), 0 ); + gpgme_data_release (text); + err = gpgme_data_new ( &text, test_text1f, strlen (test_text1f), 0 ); fail_if_err (err); - gpgme_rewind_data ( sig ); - err = gpgme_verify (ctx, sig, text ); + gpgme_data_rewind ( sig ); + err = gpgme_op_verify (ctx, sig, text ); fail_if_err (err); - gpgme_release_data (sig); - gpgme_release_data (text); + gpgme_data_release (sig); + gpgme_data_release (text); } while ( argc > 1 && !strcmp( argv[1], "--loop" ) ); - gpgme_release_context (ctx); + gpgme_release (ctx); return 0; } |