1 Return-Path: <amdragon@mit.edu>
\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 79A9D431FB6
\r
6 for <notmuch@notmuchmail.org>; Fri, 18 May 2012 12:09:55 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id ORZ8BLt6FL07 for <notmuch@notmuchmail.org>;
\r
16 Fri, 18 May 2012 12:09:53 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 394A7431FAE
\r
20 for <notmuch@notmuchmail.org>; Fri, 18 May 2012 12:09:53 -0700 (PDT)
\r
21 X-AuditID: 12074425-b7f966d0000008b6-87-4fb69e7f5b30
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 9B.08.02230.F7E96BF4; Fri, 18 May 2012 15:09:51 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4IJ9pwx005420;
\r
27 Fri, 18 May 2012 15:09:51 -0400
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4IJ9n41018569
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Fri, 18 May 2012 15:09:50 -0400 (EDT)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1SVSYe-000714-V6; Fri, 18 May 2012 15:09:49 -0400
\r
37 Date: Fri, 18 May 2012 15:09:48 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: Jameson Graef Rollins <jrollins@finestructure.net>
\r
40 Subject: Re: [PATCH v2 3/5] cli: modify mime_node_context to use the new
\r
42 Message-ID: <20120518190925.GU11804@mit.edu>
\r
43 References: <1337362357-31281-1-git-send-email-jrollins@finestructure.net>
\r
44 <1337362357-31281-2-git-send-email-jrollins@finestructure.net>
\r
45 <1337362357-31281-3-git-send-email-jrollins@finestructure.net>
\r
46 <1337362357-31281-4-git-send-email-jrollins@finestructure.net>
\r
48 Content-Type: text/plain; charset=us-ascii
\r
49 Content-Disposition: inline
\r
50 In-Reply-To: <1337362357-31281-4-git-send-email-jrollins@finestructure.net>
\r
51 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
52 X-Brightmail-Tracker:
\r
53 H4sIAAAAAAAAA+NgFmpgleLIzCtJLcpLzFFi42IR4hRV1q2ft83fYN9lU4s9+7wsrt+cyezA
\r
54 5HH3NJfHs1W3mAOYorhsUlJzMstSi/TtErgybk5aw1pwVaZi/+9nrA2MN8S6GDk4JARMJI78
\r
55 kO1i5AQyxSQu3FvP1sXIxSEksI9Rovn3CSYIZwOjxPGfT5lAqoQETjJJTG8xgEgsYZRY+vsx
\r
56 K0iCRUBVYnJPK1gRm4CGxLb9yxlBbBEBM4meL3/AbGYBLYmtGz+A2cIC0RLf/r9hA7F5BXQk
\r
57 TszbB7WtF2jBuT/MEAlBiZMzn7DANN/495IJ5GxmAWmJ5f84QExOAW+Jvg4xkApRARWJKSe3
\r
58 sU1gFJqFpHkWkuZZCM0LGJlXMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Vro5WaW6KWmlG5iBAU0
\r
59 u4vqDsYJh5QOMQpwMCrx8F6ctM1fiDWxrLgy9xCjJAeTkihv1EygEF9SfkplRmJxRnxRaU5q
\r
60 8SFGCQ5mJRHemdOBcrwpiZVVqUX5MClpDhYlcV5NrXd+QgLpiSWp2ampBalFMFkZDg4lCd6F
\r
61 c4EaBYtS01Mr0jJzShDSTBycIMN5gIbvBqnhLS5IzC3OTIfIn2JUlBLn3QuSEABJZJTmwfXC
\r
62 Es4rRnGgV4R5T4JU8QCTFVz3K6DBTECDK9nABpckIqSkGhhtsmfu2z39o/2ND/23FU9+f36A
\r
63 I+xw4P3dcyvzj8qcfnrpNNO1m6IGthPvlhV0SxsIMNssyTmoVZKwUmwOgwzf02gZyZ33eQLa
\r
64 Y3flLPvjXTzhA/cPptVB1R4tr58sfF3/t9lDao6/b3D1iTw73uS/3MdElqtdmeL7RuauahDX
\r
65 8fdtmSonj6srsRRnJBpqMRcVJwIAa9tjihMDAAA=
\r
66 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
67 X-BeenThere: notmuch@notmuchmail.org
\r
68 X-Mailman-Version: 2.1.13
\r
70 List-Id: "Use and development of the notmuch mail system."
\r
71 <notmuch.notmuchmail.org>
\r
72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
75 List-Post: <mailto:notmuch@notmuchmail.org>
\r
76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
78 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
79 X-List-Received-Date: Fri, 18 May 2012 19:09:55 -0000
\r
81 Quoth Jameson Graef Rollins on May 18 at 10:32 am:
\r
82 > This simplifies some more interfaces and gets rid of another #ifdef.
\r
84 > mime-node.c | 22 ++++++++--------------
\r
85 > 1 file changed, 8 insertions(+), 14 deletions(-)
\r
87 > diff --git a/mime-node.c b/mime-node.c
\r
88 > index 183ff5d..3dda900 100644
\r
91 > @@ -33,12 +33,7 @@ typedef struct mime_node_context {
\r
92 > GMimeMessage *mime_message;
\r
94 > /* Context provided by the caller. */
\r
95 > -#ifdef GMIME_ATLEAST_26
\r
96 > - GMimeCryptoContext *cryptoctx;
\r
98 > - GMimeCipherContext *cryptoctx;
\r
100 > - notmuch_bool_t decrypt;
\r
101 > + notmuch_crypto_t *crypto;
\r
102 > } mime_node_context_t;
\r
105 > @@ -113,8 +108,7 @@ mime_node_open (const void *ctx, notmuch_message_t *message,
\r
109 > - mctx->cryptoctx = crypto->gpgctx;
\r
110 > - mctx->decrypt = crypto->decrypt;
\r
111 > + mctx->crypto = crypto;
\r
113 > /* Create the root node */
\r
114 > root->part = GMIME_OBJECT (mctx->mime_message);
\r
115 > @@ -190,7 +184,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
117 > /* Handle PGP/MIME parts */
\r
118 > if (GMIME_IS_MULTIPART_ENCRYPTED (part)
\r
119 > - && node->ctx->cryptoctx && node->ctx->decrypt) {
\r
120 > + && node->ctx->crypto->gpgctx && node->ctx->crypto->decrypt) {
\r
121 > if (node->nchildren != 2) {
\r
122 > /* this violates RFC 3156 section 4, so we won't bother with it. */
\r
123 > fprintf (stderr, "Error: %d part(s) for a multipart/encrypted "
\r
124 > @@ -203,10 +197,10 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
125 > #ifdef GMIME_ATLEAST_26
\r
126 > GMimeDecryptResult *decrypt_result = NULL;
\r
127 > node->decrypted_child = g_mime_multipart_encrypted_decrypt
\r
128 > - (encrypteddata, node->ctx->cryptoctx, &decrypt_result, &err);
\r
129 > + (encrypteddata, node->ctx->crypto->gpgctx, &decrypt_result, &err);
\r
131 > node->decrypted_child = g_mime_multipart_encrypted_decrypt
\r
132 > - (encrypteddata, node->ctx->cryptoctx, &err);
\r
133 > + (encrypteddata, node->ctx->crypto->gpgctx, &err);
\r
135 > if (node->decrypted_child) {
\r
136 > node->decrypt_success = node->verify_attempted = TRUE;
\r
137 > @@ -224,7 +218,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
138 > (err ? err->message : "no error explanation given"));
\r
141 > - } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->cryptoctx) {
\r
142 > + } else if (GMIME_IS_MULTIPART_SIGNED (part) && node->ctx->crypto->gpgctx) {
\r
143 > if (node->nchildren != 2) {
\r
144 > /* this violates RFC 3156 section 5, so we won't bother with it. */
\r
145 > fprintf (stderr, "Error: %d part(s) for a multipart/signed message "
\r
146 > @@ -233,7 +227,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
148 > #ifdef GMIME_ATLEAST_26
\r
149 > node->sig_list = g_mime_multipart_signed_verify
\r
150 > - (GMIME_MULTIPART_SIGNED (part), node->ctx->cryptoctx, &err);
\r
151 > + (GMIME_MULTIPART_SIGNED (part), node->ctx->crypto->gpgctx, &err);
\r
152 > node->verify_attempted = TRUE;
\r
154 > if (!node->sig_list)
\r
155 > @@ -249,7 +243,7 @@ _mime_node_create (mime_node_t *parent, GMimeObject *part)
\r
156 > * In GMime 2.6, they're both non-const, so we'll be able
\r
157 > * to clean up this asymmetry. */
\r
158 > GMimeSignatureValidity *sig_validity = g_mime_multipart_signed_verify
\r
159 > - (GMIME_MULTIPART_SIGNED (part), node->ctx->cryptoctx, &err);
\r
160 > + (GMIME_MULTIPART_SIGNED (part), node->ctx->crypto.gpgctx, &err);
\r
162 This should be crypto->gpgctx.
\r
164 > node->verify_attempted = TRUE;
\r
165 > node->sig_validity = sig_validity;
\r
166 > if (sig_validity) {
\r