evolution-data-server r10042 - trunk/camel

[mcrha svn gnome org]

Author: mcrha
Date: Mon Feb  9 11:21:23 2009
New Revision: 10042
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10042&view=rev

Log:
2009-02-09  Milan Crha  <mcrha redhat com>

	** Fix for bug #266147

	* camel-gpg-context.c: (gpg_ctx_parse_status):
	Verify signature of the encrypted text, if any.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-gpg-context.c

Modified: trunk/camel/camel-gpg-context.c
==============================================================================
--- trunk/camel/camel-gpg-context.c	(original)
+++ trunk/camel/camel-gpg-context.c	Mon Feb  9 11:21:23 2009
@@ -897,6 +897,16 @@
 				/* FIXME: save this state? */
 			}
 			break;
+		case GPG_CTX_MODE_DECRYPT:
+			if (!strncmp ((char *) status, "BEGIN_DECRYPTION", 16)) {
+				/* nothing to do... but we know to expect data on stdout soon */
+				break;
+			} else if (!strncmp ((char *) status, "END_DECRYPTION", 14)) {
+				/* nothing to do, but we know the end is near? */
+				break;
+			}
+			/* let if fall through to verify possible signatures too */
+			/* break; */
 		case GPG_CTX_MODE_VERIFY:
 			if (!strncmp ((char *) status, "TRUST_", 6)) {
 				status += 6;
@@ -938,13 +948,6 @@
 				return -1;
 			}
 			break;
-		case GPG_CTX_MODE_DECRYPT:
-			if (!strncmp ((char *) status, "BEGIN_DECRYPTION", 16)) {
-				/* nothing to do... but we know to expect data on stdout soon */
-			} else if (!strncmp ((char *) status, "END_DECRYPTION", 14)) {
-				/* nothing to do, but we know the end is near? */
-			}
-			break;
 		case GPG_CTX_MODE_IMPORT:
 			/* noop */
 			break;