aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg/t-decrypt-verify.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/gpg/t-decrypt-verify.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 1a129a79..f7bbbbd4 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -1,6 +1,6 @@
/* t-decrypt-verify.c - regression test
Copyright (C) 2000 Werner Koch (dd9jn)
- Copyright (C) 2001, 2002 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003 g10 Code GmbH
This file is part of GPGME.
@@ -58,24 +58,22 @@ print_data (GpgmeData dh)
}
-static const char *
-passphrase_cb (void *opaque, const char *desc, void **r_hd)
+static GpgmeError
+passphrase_cb (void *opaque, const char *desc,
+ void **r_hd, const char **result)
{
- const char *pass;
+ if (!desc)
+ /* Cleanup by looking at *r_hd. */
+ return 0;
- if ( !desc )
- {
- /* Cleanup by looking at *r_hd. */
- return NULL;
- }
-
- pass = "abc";
+ *result = "abc";
fprintf (stderr, "%% requesting passphrase for `%s': ", desc);
- fprintf (stderr, "sending `%s'\n", pass);
-
- return pass;
+ fprintf (stderr, "sending `%s'\n", *result);
+
+ return 0;
}
+
static char *
mk_fname (const char *fname)
{