aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-04-13 04:51:01 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-04-13 04:51:01 +0800
commite24d016dac2652bc213d3c1bb073042ee99eeb3c (patch)
tree9e02ef441507c62a02fc37396fe56d1ca3434284
parentec7893f39fd19e48881491c6b577a98ab125f8a7 (diff)
downloadgsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.tar
gsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.tar.gz
gsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.tar.bz2
gsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.tar.lz
gsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.tar.xz
gsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.tar.zst
gsoc2013-evolution-e24d016dac2652bc213d3c1bb073042ee99eeb3c.zip
Fix for bug #56878.
2004-04-12 Jeffrey Stedfast <fejj@ximian.com> Fix for bug #56878. * camel-gpg-context.c (gpg_verify): Don't rely on the exit code of gpg, we already save enough state to decide if the sig is valid without it. Modified to only set BAD if gpg->validsig and gpg->nopubkey are both FALSE. If we get a NO_PUBKEY status message, then it simply means that the the sender could not be verified. (gpg_ctx_parse_status): Listen for NO_PUBKEY status messages. svn path=/trunk/; revision=25420
-rw-r--r--camel/ChangeLog12
-rw-r--r--camel/camel-gpg-context.c25
2 files changed, 29 insertions, 8 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d5fd5d7f17..cad441fff8 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-12 Jeffrey Stedfast <fejj@ximian.com>
+
+ Fix for bug #56878.
+
+ * camel-gpg-context.c (gpg_verify): Don't rely on the exit code of
+ gpg, we already save enough state to decide if the sig is valid
+ without it. Modified to only set BAD if gpg->validsig and
+ gpg->nopubkey are both FALSE. If we get a NO_PUBKEY status
+ message, then it simply means that the the sender could not be
+ verified.
+ (gpg_ctx_parse_status): Listen for NO_PUBKEY status messages.
+
2004-04-11 Sivaiah Nallagatla <snallagatla@novell.com>
* providers/groupwise/camel-gw-listener.c
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 130610f642..81e84cbc6f 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -209,13 +209,14 @@ struct _GpgCtx {
unsigned int bad_passwds:2;
unsigned int validsig:1;
+ unsigned int nopubkey:1;
unsigned int trust:3;
unsigned int diagflushed:1;
unsigned int utf8:1;
- unsigned int padding:16;
+ unsigned int padding:15;
};
static struct _GpgCtx *
@@ -261,6 +262,7 @@ gpg_ctx_new (CamelSession *session)
gpg->passwd = NULL;
gpg->validsig = FALSE;
+ gpg->nopubkey = FALSE;
gpg->trust = GPG_TRUST_NONE;
gpg->istream = NULL;
@@ -833,8 +835,10 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex)
} else if (!strncmp (status, "BADSIG", 6)) {
gpg->validsig = FALSE;
} else if (!strncmp (status, "ERRSIG", 6)) {
- /* Note: NO_PUBKEY often comes after an ERRSIG, but do we really care? */
+ /* Note: NO_PUBKEY often comes after an ERRSIG */
gpg->validsig = FALSE;
+ } else if (!strncmp (status, "NO_PUBKEY", 9)) {
+ gpg->nopubkey = TRUE;
}
break;
case GPG_CTX_MODE_ENCRYPT:
@@ -1364,7 +1368,6 @@ gpg_verify (CamelCipherContext *context, CamelMimePart *ipart, CamelException *e
const char *diagnostics = NULL, *tmp;
struct _GpgCtx *gpg = NULL;
char *sigfile = NULL;
- gboolean valid;
CamelContentType *ct;
CamelMimePart *sigpart, *datapart;
CamelStream *istream = NULL;
@@ -1430,17 +1433,23 @@ gpg_verify (CamelCipherContext *context, CamelMimePart *ipart, CamelException *e
}
}
- valid = gpg_ctx_op_wait (gpg) == 0;
+ gpg_ctx_op_wait (gpg);
validity = camel_cipher_validity_new ();
diagnostics = gpg_ctx_get_diagnostics (gpg);
camel_cipher_validity_set_description (validity, diagnostics);
- if (valid && gpg->trust > GPG_TRUST_NEVER) {
- if (gpg->trust == GPG_TRUST_UNDEFINED)
+ if (gpg->validsig) {
+ if (gpg->trust == GPG_TRUST_UNDEFINED || gpg->trust == GPG_TRUST_NONE)
validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_UNKNOWN;
- else
+ else if (gpg->trust != GPG_TRUST_NEVER)
validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_GOOD;
- } else
+ else
+ validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_BAD;
+ } else if (gpg->nopubkey) {
+ validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_UNKNOWN;
+ } else {
validity->sign.status = CAMEL_CIPHER_VALIDITY_SIGN_BAD;
+ }
+
gpg_ctx_free (gpg);
if (sigfile) {