From 65d9d64a35690f503b35d735f9bb0677e47695e2 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 3 Mar 2002 17:37:34 +0000 Subject: [PATCH] doc/ 2002-03-03 Marcus Brinkmann * gpgme.texi (Information About Keys): Document GPGME_ATTR_EXPIRE. gpgme/ 2002-03-03 Marcus Brinkmann * passphrase.c (_gpgme_passphrase_status_handler): Also set the error No_Passphrase if only a bad passphrase was provided. --- trunk/NEWS | 3 +++ trunk/TODO | 6 ------ trunk/doc/ChangeLog | 4 ++++ trunk/doc/gpgme.texi | 3 ++- trunk/gpgme/ChangeLog | 5 +++++ trunk/gpgme/passphrase.c | 3 ++- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/trunk/NEWS b/trunk/NEWS index ec9db4b..b406c49 100644 --- a/trunk/NEWS +++ b/trunk/NEWS @@ -19,10 +19,13 @@ * New interface gpgme_op_keylist_ext_start to search for multiple patterns. + * gpgme_key_get_ulong_attr supports the GPGME_ATTR_EXPIRE attribute. + * Interface changes relative to the 0.3.3 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_op_encrypt CHANGED: Can fail with GPGME_Invalid_Recipients gpgme_op_verify EXTENDED: Accepts uninitialized text argument +gpgme_key_get_ulong_attr EXTENDED: Supports GPGME_ATTR_EXPIRE gpgme_set_include_certs NEW gpgme_get_include_certs NEW gpgme_op_encrypt_sign NEW diff --git a/trunk/TODO b/trunk/TODO index 8970c39..0e1752c 100644 --- a/trunk/TODO +++ b/trunk/TODO @@ -10,8 +10,6 @@ Hey Emacs, this is -*- outline -*- mode! * add locking to the key cache? -* GpgmeKey misses GPGME_ATTR_EXPIRE attribute - * Documentation ** Add note about GPGME clearing out pointer return values. ** validity/trust @@ -38,10 +36,6 @@ Hey Emacs, this is -*- outline -*- mode! * Error Values ** Map ASSUAN/GpgSM ERR error values in a better way than is done now. ** Verify (and document) if Read_Error, Write_Error, Pipe_Error set errno. -** "There is an inconsistent behaviour: if we pass three times an - invalid (but non empty) passphrase, return code is GPGME_No_Data, - but if we pass three times an empty (and invalid) passphrase, we - get GPGME_No_Passphrase." Bug reported by Stephane Corthesy. * Tests ** Write a fake gpg-agent so that we can supply known passphrases to diff --git a/trunk/doc/ChangeLog b/trunk/doc/ChangeLog index 88d4fbf..a4c733e 100644 --- a/trunk/doc/ChangeLog +++ b/trunk/doc/ChangeLog @@ -1,3 +1,7 @@ +2002-03-03 Marcus Brinkmann + + * gpgme.texi (Information About Keys): Document GPGME_ATTR_EXPIRE. + 2002-03-03 Marcus Brinkmann * gpgme.texi (Verify): Document verification of normal and diff --git a/trunk/doc/gpgme.texi b/trunk/doc/gpgme.texi index f691e50..fb3cbe3 100644 --- a/trunk/doc/gpgme.texi +++ b/trunk/doc/gpgme.texi @@ -1358,7 +1358,8 @@ This is the timestamp at creation time of a sub key. It is representable as a number. @item GPGME_ATTR_EXPIRE -XXX FIXME +This is the expiration time of a sub key. It is representable as a +number. @item GPGME_ATTR_OTRUST XXX FIXME (also for trust items) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 1294c54..f2104c7 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2002-03-03 Marcus Brinkmann + + * passphrase.c (_gpgme_passphrase_status_handler): Also set the + error No_Passphrase if only a bad passphrase was provided. + 2002-03-03 Marcus Brinkmann * rungpg.c (_gpgme_gpg_op_verify): If TEXT is of mode diff --git a/trunk/gpgme/passphrase.c b/trunk/gpgme/passphrase.c index f6cf48d..6ba23ba 100644 --- a/trunk/gpgme/passphrase.c +++ b/trunk/gpgme/passphrase.c @@ -88,7 +88,8 @@ _gpgme_passphrase_status_handler (GpgmeCtx ctx, GpgStatusCode code, char *args) break; case STATUS_EOF: - if (ctx->result.passphrase->no_passphrase) + if (ctx->result.passphrase->no_passphrase + || ctx->result.passphrase->bad_passphrase) ctx->error = mk_error (No_Passphrase); break; -- 2.26.2