1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 58989431FCB
\r
6 for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:33 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id uIn4lGgVcPUN for <notmuch@notmuchmail.org>;
\r
17 Sat, 30 Mar 2013 06:53:30 -0700 (PDT)
\r
18 Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
\r
19 [209.85.215.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 81119431FC2
\r
22 for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:27 -0700 (PDT)
\r
23 Received: by mail-la0-f54.google.com with SMTP id gw10so1125519lab.27
\r
24 for <notmuch@notmuchmail.org>; Sat, 30 Mar 2013 06:53:26 -0700 (PDT)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
28 :references:in-reply-to:references:x-gm-message-state;
\r
29 bh=lN0nHh42XFn6MB7XkotrqdVJTtwL602UONRhOgUTqFE=;
\r
30 b=gUQ5S1hoxmvOcCR9/AH+Zs83nBvlqc6OqwBApvY4Bccm2JH84Lk1tzHsRaxsikUJvu
\r
31 242SMh3kNLPFKKZF0DqjxxWG/MYXIfYf14nKzPWJTHGp4V7q+jwR8ICe5R/BpuW+ACd0
\r
32 VySBOTbabZ1dSP2DECNLSB08pf8s9uzbO5eYStoAsPD9cyVe8BUow9d2evocJmXW4Fhj
\r
33 G5LSq1dLMwIHzE5xD0CrEyGbUCM3dVjpsKZXKYEQHJ7nBtZP5wCGR4K7efpLwVyKdTGf
\r
34 FOmEqVk0RN12C0M8Pi2tNL/Om9vJQYQ77tqZcKmc4XS1Lzrm6b1XGgOIgyES3hOhUykH
\r
36 X-Received: by 10.152.145.134 with SMTP id su6mr2780505lab.35.1364651605963;
\r
37 Sat, 30 Mar 2013 06:53:25 -0700 (PDT)
\r
38 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPS id i3sm2658459lbn.0.2013.03.30.06.53.24
\r
41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
42 Sat, 30 Mar 2013 06:53:25 -0700 (PDT)
\r
43 From: Jani Nikula <jani@nikula.org>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: [PATCH v2 2/3] cli: mime node: abstract decryption and signature
\r
47 Date: Sat, 30 Mar 2013 15:53:16 +0200
\r
49 <f68f5e573449cea7e66fc37567ddfbbf2f11131d.1364651359.git.jani@nikula.org>
\r
50 X-Mailer: git-send-email 1.7.10.4
\r
51 In-Reply-To: <cover.1364651359.git.jani@nikula.org>
\r
52 References: <cover.1364651359.git.jani@nikula.org>
\r
53 In-Reply-To: <cover.1364651359.git.jani@nikula.org>
\r
54 References: <cover.1364651359.git.jani@nikula.org>
\r
56 ALoCoQkZMAN5at7jRHEtWVm36X3z+n4cfouAvFo1R1ZPW1v1S91dnIHZNA/IqPcSmrGaiDwxAFt0
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Sat, 30 Mar 2013 13:53:33 -0000
\r
71 The code filled with #ifdef GMIME_ATLEAST_26 is difficult to
\r
72 read. Abstract the decryption and signature verification into
\r
73 functions, with separate implementations for GMime 2.4 and 2.6, to
\r
76 There should be no functional changes.
\r
78 mime-node.c | 218 ++++++++++++++++++++++++++++++++++++++---------------------
\r
79 1 file changed, 142 insertions(+), 76 deletions(-)
\r
81 diff --git a/mime-node.c b/mime-node.c
\r
82 index 839737a..851f963 100644
\r
85 @@ -130,26 +130,163 @@ DONE:
\r
88 #ifdef GMIME_ATLEAST_26
\r
90 +/* Signature list destructor (GMime 2.6) */
\r
92 _signature_list_free (GMimeSignatureList **proxy)
\r
94 g_object_unref (*proxy);
\r
99 +/* Set up signature list destructor (GMime 2.6) */
\r
101 +set_signature_list_destructor (mime_node_t *node)
\r
103 + GMimeSignatureList **proxy = talloc (node, GMimeSignatureList *);
\r
105 + *proxy = node->sig_list;
\r
106 + talloc_set_destructor (proxy, _signature_list_free);
\r
110 +/* Verify a signed mime node (GMime 2.6) */
\r
112 +node_verify (mime_node_t *node, GMimeObject *part,
\r
113 + notmuch_crypto_context_t *cryptoctx)
\r
115 + GError *err = NULL;
\r
117 + node->verify_attempted = TRUE;
\r
118 + node->sig_list = g_mime_multipart_signed_verify
\r
119 + (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err);
\r
121 + if (node->sig_list)
\r
122 + set_signature_list_destructor (node);
\r
124 + fprintf (stderr, "Failed to verify signed part: %s\n",
\r
125 + err ? err->message : "no error explanation given");
\r
128 + g_error_free (err);
\r
131 +/* Decrypt and optionally verify an encrypted mime node (GMime 2.6) */
\r
133 +node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
\r
134 + notmuch_crypto_context_t *cryptoctx)
\r
136 + GError *err = NULL;
\r
137 + GMimeDecryptResult *decrypt_result = NULL;
\r
138 + GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
\r
140 + node->decrypt_attempted = TRUE;
\r
141 + node->decrypted_child = g_mime_multipart_encrypted_decrypt
\r
142 + (encrypteddata, cryptoctx, &decrypt_result, &err);
\r
143 + if (! node->decrypted_child) {
\r
144 + fprintf (stderr, "Failed to decrypt part: %s\n",
\r
145 + err ? err->message : "no error explanation given");
\r
149 + node->decrypt_success = TRUE;
\r
150 + node->verify_attempted = TRUE;
\r
152 + /* This may be NULL if the part is not signed. */
\r
153 + node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result);
\r
154 + if (node->sig_list) {
\r
155 + g_object_ref (node->sig_list);
\r
156 + set_signature_list_destructor (node);
\r
158 + g_object_unref (decrypt_result);
\r
162 + g_error_free (err);
\r
165 +#else /* GMIME_ATLEAST_26 */
\r
167 +/* Signature validity destructor (GMime 2.4) */
\r
169 _signature_validity_free (GMimeSignatureValidity **proxy)
\r
171 g_mime_signature_validity_free (*proxy);
\r
176 +/* Set up signature validity destructor (GMime 2.4) */
\r
178 +set_signature_validity_destructor (mime_node_t *node)
\r
180 + GMimeSignatureValidity **proxy = talloc (node, GMimeSignatureValidity *);
\r
182 + *proxy = node->sig_validity;
\r
183 + talloc_set_destructor (proxy, _signature_validity_free);
\r
187 +/* Verify a signed mime node (GMime 2.4) */
\r
189 +node_verify (mime_node_t *node, GMimeObject *part,
\r
190 + notmuch_crypto_context_t *cryptoctx)
\r
192 + GError *err = NULL;
\r
194 + node->verify_attempted = TRUE;
\r
195 + node->sig_validity = g_mime_multipart_signed_verify
\r
196 + (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err);
\r
197 + if (node->sig_validity) {
\r
198 + set_signature_validity_destructor (node);
\r
200 + fprintf (stderr, "Failed to verify signed part: %s\n",
\r
201 + err ? err->message : "no error explanation given");
\r
205 + g_error_free (err);
\r
208 +/* Decrypt and optionally verify an encrypted mime node (GMime 2.4) */
\r
210 +node_decrypt_and_verify (mime_node_t *node, GMimeObject *part,
\r
211 + notmuch_crypto_context_t *cryptoctx)
\r
213 + GError *err = NULL;
\r
214 + GMimeMultipartEncrypted *encrypteddata = GMIME_MULTIPART_ENCRYPTED (part);
\r
216 + node->decrypt_attempted = TRUE;
\r
217 + node->decrypted_child = g_mime_multipart_encrypted_decrypt
\r
218 + (encrypteddata, cryptoctx, &err);
\r
219 + if (! node->decrypted_child) {
\r
220 + fprintf (stderr, "Failed to decrypt part: %s\n",
\r
221 + err ? err->message : "no error explanation given");
\r
225 + node->decrypt_success = TRUE;
\r
226 + node->verify_attempted = TRUE;
\r
228 + /* The GMimeSignatureValidity returned here is a const, unlike the
\r
229 + * one returned by g_mime_multipart_signed_verify() in
\r
230 + * node_verify() above, so the destructor is not needed.
\r
232 + node->sig_validity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata);
\r
233 + if (! node->sig_validity)
\r
234 + fprintf (stderr, "Failed to verify encrypted signed part: %s\n",
\r
235 + err ? err->message : "no error explanation given");
\r
239 + g_error_free (err);
\r
242 +#endif /* GMIME_ATLEAST_26 */
\r
244 static mime_node_t *
\r
245 _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
247 mime_node_t *node = talloc_zero (parent, mime_node_t);
\r
248 - GError *err = NULL;
\r
249 notmuch_crypto_context_t *cryptoctx = NULL;
\r
251 /* Set basic node properties */
\r
252 @@ -198,32 +335,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
253 "message (must be exactly 2)\n",
\r
256 - GMimeMultipartEncrypted *encrypteddata =
\r
257 - GMIME_MULTIPART_ENCRYPTED (part);
\r
258 - node->decrypt_attempted = TRUE;
\r
259 -#ifdef GMIME_ATLEAST_26
\r
260 - GMimeDecryptResult *decrypt_result = NULL;
\r
261 - node->decrypted_child = g_mime_multipart_encrypted_decrypt
\r
262 - (encrypteddata, cryptoctx, &decrypt_result, &err);
\r
264 - node->decrypted_child = g_mime_multipart_encrypted_decrypt
\r
265 - (encrypteddata, cryptoctx, &err);
\r
267 - if (node->decrypted_child) {
\r
268 - node->decrypt_success = node->verify_attempted = TRUE;
\r
269 -#ifdef GMIME_ATLEAST_26
\r
270 - /* This may be NULL if the part is not signed. */
\r
271 - node->sig_list = g_mime_decrypt_result_get_signatures (decrypt_result);
\r
272 - if (node->sig_list)
\r
273 - g_object_ref (node->sig_list);
\r
274 - g_object_unref (decrypt_result);
\r
276 - node->sig_validity = g_mime_multipart_encrypted_get_signature_validity (encrypteddata);
\r
279 - fprintf (stderr, "Failed to decrypt part: %s\n",
\r
280 - (err ? err->message : "no error explanation given"));
\r
282 + node_decrypt_and_verify (node, part, cryptoctx);
\r
284 } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->verify && cryptoctx) {
\r
285 if (node->nchildren != 2) {
\r
286 @@ -232,56 +344,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
287 "(must be exactly 2)\n",
\r
290 -#ifdef GMIME_ATLEAST_26
\r
291 - node->sig_list = g_mime_multipart_signed_verify
\r
292 - (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err);
\r
293 - node->verify_attempted = TRUE;
\r
295 - if (!node->sig_list)
\r
296 - fprintf (stderr, "Failed to verify signed part: %s\n",
\r
297 - (err ? err->message : "no error explanation given"));
\r
299 - /* For some reason the GMimeSignatureValidity returned
\r
300 - * here is not a const (inconsistent with that
\r
302 - * g_mime_multipart_encrypted_get_signature_validity,
\r
303 - * and therefore needs to be properly disposed of.
\r
305 - * In GMime 2.6, they're both non-const, so we'll be able
\r
306 - * to clean up this asymmetry. */
\r
307 - GMimeSignatureValidity *sig_validity = g_mime_multipart_signed_verify
\r
308 - (GMIME_MULTIPART_SIGNED (part), cryptoctx, &err);
\r
309 - node->verify_attempted = TRUE;
\r
310 - node->sig_validity = sig_validity;
\r
311 - if (sig_validity) {
\r
312 - GMimeSignatureValidity **proxy =
\r
313 - talloc (node, GMimeSignatureValidity *);
\r
314 - *proxy = sig_validity;
\r
315 - talloc_set_destructor (proxy, _signature_validity_free);
\r
318 + node_verify (node, part, cryptoctx);
\r
322 -#ifdef GMIME_ATLEAST_26
\r
323 - /* sig_list may be created in both above cases, so we need to
\r
324 - * cleanly handle it here. */
\r
325 - if (node->sig_list) {
\r
326 - GMimeSignatureList **proxy = talloc (node, GMimeSignatureList *);
\r
327 - *proxy = node->sig_list;
\r
328 - talloc_set_destructor (proxy, _signature_list_free);
\r
332 -#ifndef GMIME_ATLEAST_26
\r
333 - if (node->verify_attempted && !node->sig_validity)
\r
334 - fprintf (stderr, "Failed to verify signed part: %s\n",
\r
335 - (err ? err->message : "no error explanation given"));
\r
339 - g_error_free (err);
\r