diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 20 | ||||
| -rw-r--r-- | camel/camel-gpg-context.c | 6 |
2 files changed, 19 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 702155f0fe..c4faefa9ad 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2004-06-09 Jeffrey Stedfast <fejj@ximian.com> + + * camel-gpg-context.c (gpg_verify): Don't assign trust to be + UNKNOWN if gpg sent us a NODATA status. + 2004-06-07 Jeffrey Stedfast <fejj@novell.com> * providers/imap4/camel-imap4-folder.c (camel_imap4_folder_new): @@ -218,12 +223,15 @@ 2004-05-24 Sivaiah Nallagatla <snallagatla@novell.com> - * camel-provider.h : added CAMEL_PROVIDER_CONF_HIDDEN to + * camel-provider.h: Added CAMEL_PROVIDER_CONF_HIDDEN to conf item type enum. This is used by groupwise provider - * providers/groupwise/camel-groupwise-provider.c : Added CAMEL_PROVIDER_CONF_HIDDEN - to groupwise_conf_entries to pass the auth-domain value - * providers/imap/camel-imap-store.c (imap_auth_loop) : read the auth-domain - property from imap url and pass it camel sesstion apis + + * providers/groupwise/camel-groupwise-provider.c: Added + CAMEL_PROVIDER_CONF_HIDDEN to groupwise_conf_entries to pass the + auth-domain value + + * providers/imap/camel-imap-store.c (imap_auth_loop): Read the + auth-domain property from imap url and pass it camel sesstion apis 2004-05-22 Not Zed <NotZed@Ximian.com> @@ -242,7 +250,7 @@ * providers/imap/camel-imap-store.c (connect_to_server): Added a workaround for broken IMAP. Hopefully by forcing only the IMAP4 - command subst, we can work around their suckage. + command subset, we can work around their suckage. 2004-05-21 Not Zed <NotZed@Ximian.com> diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index b69feb9277..9623b7d347 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -208,6 +208,7 @@ struct _GpgCtx { unsigned int bad_passwds:2; + unsigned int nodata:1; unsigned int hadsig:1; unsigned int badsig:1; unsigned int errsig:1; @@ -265,6 +266,7 @@ gpg_ctx_new (CamelSession *session) gpg->need_id = NULL; gpg->passwd = NULL; + gpg->nodata = FALSE; gpg->hadsig = FALSE; gpg->badsig = FALSE; gpg->errsig = FALSE; @@ -852,6 +854,8 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex) gpg->hadsig = TRUE; } else if (!strncmp (status, "NO_PUBKEY ", 10)) { gpg->nopubkey = TRUE; + } else if (!strncmp (status, "NODATA", 6)) { + gpg->nodata = TRUE; } break; case GPG_CTX_MODE_ENCRYPT: @@ -1457,7 +1461,7 @@ gpg_verify (CamelCipherContext *context, CamelMimePart *ipart, CamelException *e validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_GOOD; else validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_BAD; - } else if (gpg->nopubkey) { + } else if (!gpg->nodata && gpg->nopubkey) { validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_UNKNOWN; } else { validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_BAD; |