From d8c728732654b00e0427044d425f9c7a9a08e3f2 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 26 Jun 2002 18:49:05 +0000 Subject: Check for NODATA too. 2002-06-26 Jeffrey Stedfast * camel-gpg-context.c (gpg_ctx_parse_status): Check for NODATA too. svn path=/trunk/; revision=17295 --- camel/ChangeLog | 5 +++++ camel/camel-gpg-context.c | 5 +++++ camel/camel-multipart-signed.h | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index dbbe6e2eca..a10762770a 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2002-06-26 Jeffrey Stedfast + + * camel-gpg-context.c (gpg_ctx_parse_status): Check for NODATA + too. + 2002-06-25 Jeffrey Stedfast * providers/local/camel-local-provider.c: Remove the #include for diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index 124182b955..1c7daaa72b 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -780,6 +780,11 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex) _("Unexpected response from GnuPG: %s"), status + 11); return -1; + } else if (!strncmp (status, "NODATA", 6)) { + /* this is an error */ + camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, + _("No data provided")); + return -1; } else { /* check to see if we are complete */ switch (gpg->mode) { diff --git a/camel/camel-multipart-signed.h b/camel/camel-multipart-signed.h index 7371e370ed..be0a8b4d9d 100644 --- a/camel/camel-multipart-signed.h +++ b/camel/camel-multipart-signed.h @@ -91,8 +91,11 @@ CamelType camel_multipart_signed_get_type (void); /* public methods */ CamelMultipartSigned *camel_multipart_signed_new (void); -int camel_multipart_signed_sign (CamelMultipartSigned *mps, CamelCipherContext *context, CamelMimePart *content, const char *uiserid, CamelCipherHash hash, CamelException *ex); -CamelCipherValidity *camel_multipart_signed_verify (CamelMultipartSigned *mps, CamelCipherContext *context, CamelException *ex); +int camel_multipart_signed_sign (CamelMultipartSigned *mps, CamelCipherContext *context, + CamelMimePart *content, const char *uiserid, + CamelCipherHash hash, CamelException *ex); +CamelCipherValidity *camel_multipart_signed_verify (CamelMultipartSigned *mps, CamelCipherContext *context, + CamelException *ex); #ifdef __cplusplus } -- cgit