From 5a37051361cd2d8c47c49f7ac3c4ae6fd0e0c206 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 6 Feb 2003 20:09:24 +0000 Subject: doc/ 2003-02-06 Marcus Brinkmann * gpgme.texi (Cancelling an Operation): Removed. (Passphrase Callback): Document new type for GpgmePassphraseCb. gpgme/ 2003-02-06 Marcus Brinkmann * gpgme.h (GpgmePassphraseCb): Change type to return GpgmeError, and add argument for returning the result string. (gpgme_cancel): Remove prototype. * gpgme.c (gpgme_cancel): Remove function. * context.h (struct gpgme_context_s): Remove member cancel. * passphrase.c (_gpgme_passphrase_command_handler): Call the passphrase callback in the new way. tests/ 2003-02-06 Marcus Brinkmann * gpg/t-decrypt.c (passphrase_cb): Fix to new prototype. * gpg/t-decrypt-verify.c (passphrase_cb): Likewise. * gpg/t-edit.c (passphrase_cb): Likewise. * gpg/t-encrypt-sign.c (passphrase_cb): Likewise. * gpg/t-encrypt-sym.c (passphrase_cb): Likewise. * gpg/t-sign.c (passphrase_cb): Likewise. * gpg/t-signers.c (passphrase_cb): Likewise. --- tests/ChangeLog | 10 ++++++++++ tests/gpg/t-decrypt-verify.c | 26 ++++++++++++------------- tests/gpg/t-decrypt.c | 45 +++++++++++++------------------------------- tests/gpg/t-edit.c | 23 ++++++++++------------ tests/gpg/t-encrypt-sign.c | 26 +++++++++++-------------- tests/gpg/t-encrypt-sym.c | 31 +++++++++++++----------------- tests/gpg/t-sign.c | 28 ++++++++++++--------------- tests/gpg/t-signers.c | 25 +++++++++++------------- 8 files changed, 92 insertions(+), 122 deletions(-) (limited to 'tests') diff --git a/tests/ChangeLog b/tests/ChangeLog index 2ff2aff5..37d6d11c 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,13 @@ +2003-02-06 Marcus Brinkmann + + * gpg/t-decrypt.c (passphrase_cb): Fix to new prototype. + * gpg/t-decrypt-verify.c (passphrase_cb): Likewise. + * gpg/t-edit.c (passphrase_cb): Likewise. + * gpg/t-encrypt-sign.c (passphrase_cb): Likewise. + * gpg/t-encrypt-sym.c (passphrase_cb): Likewise. + * gpg/t-sign.c (passphrase_cb): Likewise. + * gpg/t-signers.c (passphrase_cb): Likewise. + 2003-01-30 Marcus Brinkmann * t-engine-info.c: Use file_name instead path throughout. 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) { diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c index 0eda6acd..39f534ff 100644 --- a/tests/gpg/t-decrypt.c +++ b/tests/gpg/t-decrypt.c @@ -1,6 +1,6 @@ -/* t-encrypt.c - regression test +/* t-decrypt.c - regression test * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001 g10 Code GmbH + * Copyright (C) 2001, 2003 g10 Code GmbH * * This file is part of GPGME. * @@ -41,21 +41,6 @@ struct passphrase_cb_info_s { exit (1); } \ } while(0) -static void -print_op_info (GpgmeCtx ctx) -{ - char *str = gpgme_get_op_info (ctx, 0); - - if (!str) - puts (""); - else - { - puts (str); - free (str); - } -} - - static void print_data (GpgmeData dh) { @@ -72,23 +57,19 @@ 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 NULL; - } - - pass = "abc"; - fprintf (stderr, "%% requesting passphrase for `%s': ", desc ); - fprintf (stderr, "sending `%s'\n", pass ); + if (!desc) + /* Cleanup by looking at *r_hd. */ + return 0; - return pass; + *result = "abc"; + fprintf (stderr, "%% requesting passphrase for `%s': ", desc); + fprintf (stderr, "sending `%s'\n", *result); + + return 0; } diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c index 8117d587..b78a7fe2 100644 --- a/tests/gpg/t-edit.c +++ b/tests/gpg/t-edit.c @@ -1,6 +1,6 @@ /* t-edit.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. * @@ -57,22 +57,19 @@ flush_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 NULL; - } + /* Cleanup by looking at *r_hd. */ + return 0; - 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; } diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c index dfd54bed..36bd888c 100644 --- a/tests/gpg/t-encrypt-sign.c +++ b/tests/gpg/t-encrypt-sign.c @@ -62,23 +62,19 @@ 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 NULL; - } - - pass = "abc"; - fprintf (stderr, "%% requesting passphrase for `%s': ", desc ); - fprintf (stderr, "sending `%s'\n", pass ); + if (!desc) + /* Cleanup by looking at *r_hd. */ + return 0; - return pass; + *result = "abc"; + fprintf (stderr, "%% requesting passphrase for `%s': ", desc); + fprintf (stderr, "sending `%s'\n", *result); + + return 0; } diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c index db3f3e9e..520005ca 100644 --- a/tests/gpg/t-encrypt-sym.c +++ b/tests/gpg/t-encrypt-sym.c @@ -1,6 +1,6 @@ -/* t-encrypt.c - regression test +/* t-encrypt-sym.c - regression test * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001 g10 Code GmbH + * Copyright (C) 2001, 2003 g10 Code GmbH * * This file is part of GPGME. * @@ -47,24 +47,19 @@ print_data (GpgmeData dh) fail_if_err (GPGME_File_Error); } - -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 NULL; - } + if (!desc) + /* Cleanup by looking at *r_hd. */ + return 0; - pass = "abc"; - fprintf (stderr, "%% requesting passphrase for `%s': ", desc ); - fprintf (stderr, "sending `%s'\n", pass ); - - return pass; + *result = "abc"; + fprintf (stderr, "%% requesting passphrase for `%s': ", desc); + fprintf (stderr, "sending `%s'\n", *result); + + return 0; } diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c index 9caaf696..1e69930b 100644 --- a/tests/gpg/t-sign.c +++ b/tests/gpg/t-sign.c @@ -1,6 +1,6 @@ /* t-sign.c - regression test * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001 g10 Code GmbH + * Copyright (C) 2001, 2003 g10 Code GmbH * * This file is part of GPGME. * @@ -63,23 +63,19 @@ 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 NULL; - } - - pass = "abc"; - fprintf (stderr, "%% requesting passphrase for `%s': ", desc ); - fprintf (stderr, "sending `%s'\n", pass ); + if (!desc) + /* Cleanup by looking at *r_hd. */ + return 0; - return pass; + *result = "abc"; + fprintf (stderr, "%% requesting passphrase for `%s': ", desc); + fprintf (stderr, "sending `%s'\n", *result); + + return 0; } diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c index 2e8d3f41..d17b3976 100644 --- a/tests/gpg/t-signers.c +++ b/tests/gpg/t-signers.c @@ -1,6 +1,6 @@ /* t-signers.c - Regression tests for the Gpgme multiple signers interface. * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001 g10 Code GmbH + * Copyright (C) 2001, 2003 g10 Code GmbH * * This file is part of GPGME. * @@ -62,25 +62,22 @@ print_data (GpgmeData dh) fail_if_err (GPGME_File_Error); } - -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 NULL; - } + /* Cleanup by looking at *r_hd. */ + return 0; - 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; } + int main (int argc, char *argv[]) { -- cgit v1.2.3