From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4GrjF+ksH2PXhgAAbAwnHQ (envelope-from ) for ; Mon, 12 Sep 2022 14:58:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id ALrOF+ksH2PKjgAA9RJhRA (envelope-from ) for ; Mon, 12 Sep 2022 14:58:17 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0E03B2E21 for ; Mon, 12 Sep 2022 14:58:17 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 877BA5F35E; Mon, 12 Sep 2022 12:58:09 +0000 (UTC) Received: from che.mayfirst.org (unknown [162.247.75.117]) by mail.notmuchmail.org (Postfix) with ESMTPS id 05E9F5DD5A for ; Mon, 12 Sep 2022 12:58:05 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1662987056; h=from : to : subject : in-reply-to : references : date : message-id : mime-version : content-type : from; bh=VcpPlY87i1+xe5cuX3u+CBHYXlRoDAnYpwXp0MR5FRE=; b=kqQF6TMdHlcGgQMkfQeJ2yBHnSwm5nAQFYsyC+6ZLT18It5pNvynw4AN2NMxhHNBgM5l0 vslIBm3Y9PxxoE7BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1662987056; h=from : to : subject : in-reply-to : references : date : message-id : mime-version : content-type : from; bh=VcpPlY87i1+xe5cuX3u+CBHYXlRoDAnYpwXp0MR5FRE=; b=urno1FignR7ZJwf2fcx9xtsNjeAItcCXoEa3OG69zQsqZyA4v7SgAoUlq2E0cGHDMt9+q Qjm0Ow+fJE0W2LZSqtpO5HtAv76Gpwgiv9o66OXKECxC/qzliU3yLTIpyHYBWDDZI/H0YEl R7ukwFjbooiOXba+oCJkQZlPSgGOKbVNdSK7qe8MKtV3TAePSAWEG7FY8FRWXlmpUoWstMh ZbYz9dspI/XVyAVT326iAtdrEIs7G13ycg7bAt2EC+9dtIEJONSKPcS8/bb0nDyRxOuB5D6 dpQshAS/kVY5X8tjQ2XYXW+twu2uctn683ycGZYNbbxAA387DUB9PYMUIwEw== Received: from fifthhorseman.net (lair.fifthhorseman.net [108.58.6.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 18018F9AD; Mon, 12 Sep 2022 08:50:55 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 7FF9F205B8; Sun, 11 Sep 2022 13:09:51 -0400 (EDT) From: Daniel Kahn Gillmor To: Justus Winter , notmuch@notmuchmail.org Subject: Re: [PATCH 2/2] test: replace aging OpenPGP key used in the test suite In-Reply-To: <20220909161354.715326-1-justus@sequoia-pgp.org> References: <20220909161250.715226-1-justus@sequoia-pgp.org> <20220909161354.715326-1-justus@sequoia-pgp.org> Autocrypt: addr=dkg@fifthhorseman.net; prefer-encrypt=mutual; keydata= mDMEX+i03xYJKwYBBAHaRw8BAQdACA4xvL/xI5dHedcnkfViyq84doe8zFRid9jW7CC9XBiI0QQf FgoAgwWCX+i03wWJBZ+mAAMLCQcJEOCS6zpcoQ26RxQAAAAAAB4AIHNhbHRAbm90YXRpb25zLnNl cXVvaWEtcGdwLm9yZ/tr8E9NA10HvcAVlSxnox6z62KXCInWjZaiBIlgX6O5AxUKCAKbAQIeARYh BMKfigwB81402BaqXOCS6zpcoQ26AADZHQD/Zx9nc3N2kj13AUsKMr/7zekBtgfSIGB3hRCU74Su G44A/34Yp6IAkndewLxb1WdRSokycnaCVyrk0nb4imeAYyoPtBc8ZGtnQGZpZnRoaG9yc2VtYW4u bmV0PojRBBMWCgCDBYJf6LTfBYkFn6YAAwsJBwkQ4JLrOlyhDbpHFAAAAAAAHgAgc2FsdEBub3Rh dGlvbnMuc2VxdW9pYS1wZ3Aub3JnL0Gwxvypz2tu1IPG+yu1zPjkiZwpscsitwrVvzN3bbADFQoI ApsBAh4BFiEEwp+KDAHzXjTYFqpc4JLrOlyhDboAAPkXAP0Z29z7jW+YzLzPTQML4EQLMbkHOfU4 +s+ki81Czt0WqgD/SJ8RyrqDCtEP8+E4ZSR01ysKqh+MUAsTaJlzZjehiQ24MwRf6LTfFgkrBgEE AdpHDwEBB0DkKHOW2kmqfAK461+acQ49gc2Z6VoXMChRqobGP0ubb4kBiAQYFgoBOgWCX+i03wWJ BZ+mAAkQ4JLrOlyhDbpHFAAAAAAAHgAgc2FsdEBub3RhdGlvbnMuc2VxdW9pYS1wZ3Aub3Jnfvo+ nHoxDwaLaJD8XZuXiaqBNZtIGXIypF1udBBRoc0CmwICHgG+oAQZFgoAbwWCX+i03wkQPp1xc3He VlxHFAAAAAAAHgAgc2FsdEBub3RhdGlvbnMuc2VxdW9pYS1wZ3Aub3JnaheiqE7Pfi3Atb3GGTw+ jFcBGOaobgzEJrhEuFpXREEWIQQttUkcnfDcj0MoY88+nXFzcd5WXAAAvrsBAIJ5sBg8Udocv25N stN/zWOiYpnjjvOjVMLH4fV3pWE1AP9T6hzHz7hRnAA8d01vqoxOlQ3O6cb/kFYAjqx3oMXSBhYh BMKfigwB81402BaqXOCS6zpcoQ26AADX7gD/b83VObe14xrNP8xcltRrBZF5OE1rQSPkMNy+eWpk eCwA/1hxiS8ZxL5/elNjXiWuHXEvUGnRoVj745Vl48sZPVYMuDgEX+i03xIKKwYBBAGXVQEFAQEH QIGex1WZbH6xhUBve5mblScGYU+Y8QJOomXH+rr5tMsMAwEICYjJBBgWCgB7BYJf6LTfBYkFn6YA CRDgkus6XKENukcUAAAAAAAeACBzYWx0QG5vdGF0aW9ucy5zZXF1b2lhLXBncC5vcmcEAx9vTD3b J0SXkhvcRcCr6uIDJwic3KFKxkH1m4QW0QKbDAIeARYhBMKfigwB81402BaqXOCS6zpcoQ26AAAX mwD8CWmukxwskU82RZLMk5fm1wCgMB5z8dA50KLw3rgsCykBAKg1w/Y7XpBS3SlXEegIg1K1e6dR fRxL7Z37WZXoH8AH Date: Sun, 11 Sep 2022 13:09:50 -0400 Message-ID: <875yhtq1lt.fsf@fifthhorseman.net> MIME-Version: 1.0 Message-ID-Hash: DBZEYSPYJI65RYSIDXOBHPGTNPADYQ73 X-Message-ID-Hash: DBZEYSPYJI65RYSIDXOBHPGTNPADYQ73 X-MailFrom: dkg@fifthhorseman.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: multipart/mixed; boundary="===============1176327684774146376==" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662987497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature:autocrypt:autocrypt; bh=iR5/uV8X8o9LkhtmTD9OAyuQPL9gPP5qBFPONAOmJE0=; b=npo3QkVz+SnqFmx8pQTl30IbFS5yXNrZjifMRL94UIhE6dHFS0OlD8yJgZzJ4oS8qYqbvE zYd5jdFgO4XsejI1GR1Jc05JjCHouTfZvLXHsC5HWOCA40MBR4KVCDSWsSCgDXhDc3NRgo zjcT7z+797OmFiUMqSKlhK8xuAdrekg3p7fY3m72w8Y05vPFX42XSgu/9e4aozw46WhUD4 uIbrSd3TJjrFTcqwa3p60MO4gcKTwuwDZYB8Hv7qnTdB/XrZikYG9Tn1fKjQrpFx7Aq0SW cBZThddNyfBAfFoQPc14Y3s9H9zk6zvedLfdFjldmRe4so/FPJO7w8Y6ySR9VA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662987497; a=rsa-sha256; cv=none; b=UMkfqXKExRtyaOfdHPXSAithXHgQa3WcvChFibWJgj4sG6ddfZsp5Em2WrEsX8bjyMGZ0f PeKcdS9ZwZZy5PVvf9o9I6i5c0KLMZn+rLy2iS4QKPlOmxpURlnX/gluUE/rA2gV7kr1Lc 6p77pLziXOkP+QRGsGgUpnEkNGu2WYRHAuepVIGW8RCgrbUNzMb4+Jgf0Ur6sLggyo1K/3 8GxVW1dBaFD6whwjuZfRL0rQ9DzxgpqD4pKKZYpks+UQKBCGMKQ+yXATyn6mXdBfiwoYfO k12As8us0aCEIjSbFP19LhDDLkEihkdWLFrzeFiBKLpsKLPdYAacb44y/iHrcA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019 header.b=kqQF6TMd; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019rsa header.b=urno1Fig; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fifthhorseman.net (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019 header.b=kqQF6TMd; dkim=fail ("body hash did not verify") header.d=fifthhorseman.net header.s=2019rsa header.b=urno1Fig; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fifthhorseman.net (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 0E03B2E21 X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: WsBPZ6oeAhbU --===============1176327684774146376== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable This series looks good to me. i've tested it and there are no failures, and there's nothing i can see that's obviously missing from it. Thanks for the thorough fix, Justus! A few notes about the change (none of them even close to being blockers): - i note that signature creation timestamps had to be updated -- some future improvement might make it useful to abstract that away in the tests. - a few message digests seem to have changed from SHA2-512 to SHA2-256. I don't think there's a problem here, just noting that it's different. - I like the renaming of the secret key material to "openpgp4-secret-key.asc" so that it makes room for a possible future v5 secret key, and doesn't refer to a specific OpenPGP implementation. - instead of using an entirely novel key, another approach would have been to use one of the sample certificates from https://datatracker.ietf.org/doc/draft-bre-openpgp-samples/ I'm fine with going with the route Justus proposes here, just wanted to raise that using a stock key (one that multiple implementations have probably already themselves used for testing) can help avoid weird OpenPGP-specific gotchas that don't teach us much about notmuch. Anyway, something for future considerations. All the best, --dkg On Fri 2022-09-09 18:13:54 +0200, Justus Winter wrote: > This replaces the old OpenPGPv4 key that is used in the test suite > with a more modern OpenPGPv4 key. All cryptographic artifacts in the > test suite are updated accordingly. > > Having old cryptographic artifacts in the test suite presents a > problem once the old algorithms are rejected by contemporary > implementations. > > For reference, this is the old key. > > sec rsa1024 2011-02-05 [SC] > 5AEAB11F5E33DCE875DDB75B6D92612D94E46381 > uid [ unknown] Notmuch Test Suite (INSECURE!) > ssb rsa1024 2011-02-05 [E] > > And this is the new key. Note that is has the same shape, but uses > Ed25519 and Cv25519 instead of 1024-bit RSA. > > sec ed25519 2022-09-07 [SC] > 9A3AFE6C60065A148FD4B58A7E6ABE924645CC60 > uid [ultimate] Notmuch Test Suite (INSECURE!) > ssb cv25519 2022-09-07 [E] > --- > test/T356-protected-headers.sh | 8 +-- > test/corpora/crypto/basic-encrypted.eml | 13 +++-- > .../crypto/encrypted-rfc822-attachment | 49 +++++++++---------- > test/corpora/crypto/encrypted-signed.eml | 27 +++++----- > test/corpora/mangling/mixed-up.eml | 14 ++---- > ...le-wrapped-with-phony-protected-header.eml | 37 +++++++------- > ...pted-message-with-forwarded-attachment.eml | 29 ++++++----- > .../encrypted-signed-not-masked.eml | 25 +++++----- > .../protected-headers/encrypted-signed.eml | 25 +++++----- > .../misplaced-protected-header.eml | 36 ++++++++------ > .../nested-rfc822-message.eml | 23 ++++----- > .../no-protected-header-attribute.eml | 16 +++--- > .../phony-protected-header-bad-encryption.eml | 13 ++--- > .../protected-headers/protected-header.eml | 15 +++--- > .../protected-with-legacy-display.eml | 38 +++++++------- > .../signed-protected-header.eml | 11 ++--- > .../protected-headers/simple-signed-mail.eml | 11 ++--- > .../subjectless-protected-header.eml | 15 +++--- > .../wrapped-protected-header.eml | 15 +++--- > test/gnupg-secret-key.NOTE | 9 ---- > test/gnupg-secret-key.asc | 34 ------------- > test/openpgp4-secret-key.asc | 15 ++++++ > test/openpgp4-secret-key.asc.NOTE | 5 ++ > test/test-lib.sh | 6 +-- > 24 files changed, 232 insertions(+), 257 deletions(-) > delete mode 100644 test/gnupg-secret-key.NOTE > delete mode 100644 test/gnupg-secret-key.asc > create mode 100644 test/openpgp4-secret-key.asc > create mode 100644 test/openpgp4-secret-key.asc.NOTE > > diff --git a/test/T356-protected-headers.sh b/test/T356-protected-headers= .sh > index f0aba14e..9f640331 100755 > --- a/test/T356-protected-headers.sh > +++ b/test/T356-protected-headers.sh > @@ -69,12 +69,12 @@ test_json_nodes <<<"$output" \ > test_begin_subtest "show cryptographic envelope on signed mail" > output=3D$(notmuch show --verify --format=3Djson id:simple-signed-mail@c= rypto.notmuchmail.org) > test_json_nodes <<<"$output" \ > - 'crypto:[0][0][0]["crypto"]=3D{"signed": {"status": [{"c= reated": 1525609971, "fingerprint": "'$FINGERPRINT'", "email": "'"$SELF_EMA= IL"'", "userid": "'"$SELF_USERID"'", "status": "good"}]}}' > + 'crypto:[0][0][0]["crypto"]=3D{"signed": {"status": [{"c= reated": 1662554210, "fingerprint": "'$FINGERPRINT'", "email": "'"$SELF_EMA= IL"'", "userid": "'"$SELF_USERID"'", "status": "good"}]}}' >=20=20 > test_begin_subtest "verify signed protected header" > output=3D$(notmuch show --verify --format=3Djson id:signed-protected-hea= der@crypto.notmuchmail.org) > test_json_nodes <<<"$output" \ > - 'crypto:[0][0][0]["crypto"]=3D{"signed": {"status": [{"c= reated": 1525350527, "fingerprint": "'$FINGERPRINT'", "email": "'"$SELF_EMA= IL"'", "userid": "'"$SELF_USERID"'", "status": "good"}], "headers": ["Subje= ct"]}}' > + 'crypto:[0][0][0]["crypto"]=3D{"signed": {"status": [{"c= reated": 1662554263, "fingerprint": "'$FINGERPRINT'", "email": "'"$SELF_EMA= IL"'", "userid": "'"$SELF_USERID"'", "status": "good"}], "headers": ["Subje= ct"]}}' >=20=20 > test_begin_subtest "protected subject does not leak by default in replie= s" > output=3D$(notmuch reply --decrypt=3Dtrue --format=3Djson id:protected-h= eader@crypto.notmuchmail.org) > @@ -115,7 +115,7 @@ test_begin_subtest "verify protected header is both s= igned and encrypted" > output=3D$(notmuch show --decrypt=3Dtrue --format=3Djson id:encrypted-si= gned@crypto.notmuchmail.org) > test_json_nodes <<<"$output" \ > 'crypto:[0][0][0]["crypto"]=3D{ > - "signed":{"status": [{"status": "good", "fingerprint"= : "'$FINGERPRINT'", "email": "'"$SELF_EMAIL"'", "userid": "'"$SELF_USERID"'= ", "created": 1525812676}], > + "signed":{"status": [{"status": "good", "fingerprint"= : "'$FINGERPRINT'", "email": "'"$SELF_EMAIL"'", "userid": "'"$SELF_USERID"'= ", "created": 1662550328}], > "encrypted": true, "headers": ["Subject"]},"decrypted= ": {"status": "full", "header-mask": {"Subject": "Subject Unavailable"}}}' \ > 'subject:[0][0][0]["headers"]["Subject"]=3D"Rhinoceros d= inner"' >=20=20 > @@ -123,7 +123,7 @@ test_begin_subtest "verify protected header is signed= even when not masked" > output=3D$(notmuch show --decrypt=3Dtrue --format=3Djson id:encrypted-si= gned-not-masked@crypto.notmuchmail.org) > test_json_nodes <<<"$output" \ > 'crypto:[0][0][0]["crypto"]=3D{ > - "signed":{"status": [{"status": "good", "fingerprint"= : "'$FINGERPRINT'", "userid": "'"$SELF_USERID"'", "email": "'"$SELF_EMAIL"'= ", "created": 1525812676}], > + "signed":{"status": [{"status": "good", "fingerprint"= : "'$FINGERPRINT'", "userid": "'"$SELF_USERID"'", "email": "'"$SELF_EMAIL"'= ", "created": 1662550328}], > "encrypted": true, "headers": ["Subject"]},"decrypted= ": {"status": "full"}}' \ > 'subject:[0][0][0]["headers"]["Subject"]=3D"Rhinoceros d= inner"' >=20=20 > diff --git a/test/corpora/crypto/basic-encrypted.eml b/test/corpora/crypt= o/basic-encrypted.eml > index 1ba4698a..b139a735 100644 > --- a/test/corpora/crypto/basic-encrypted.eml > +++ b/test/corpora/crypto/basic-encrypted.eml > @@ -17,12 +17,11 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBACp70e7KPy9OYaheIrkLzmhq1lRqmy51aL1jBL0K/qN7rfK > -BZEG1cR8jeLjTFdPKPLVKJI80r7FgKI0ywvWvl6R1aE1Ty5BnVXT9XzCrEH7fqCl > -SKK82EvolXTohAZHUrh6K66eQQTTIAC1n7B0A8hErzkgaM4+seN3LlvezT6TLNKM > -ATpqsEbM2MVrGgw0b3oUsGGAPEt2MmjNEYsriKnqwt6dJDZc//XyhjgMQayiD8da > -N1gT3oqgu/gKCpBZDYzHf9OtVi2UnlFDWy6rrMZLjWDnIv4ve9Pn/qolwHVjzdJ1 > -ZfjNC5t0z3XADKGrjN9wutr4qm7STW1rHAXHP68TQTxI0qgJKjPXNKWEw6g=3D > -=3DpJG4 > +hF4DHXHP849rSK8SAQdAYbv9NFaU2Fbd6JbfE87h/yZNyWLJYZ2EseU0WyOz7Agw > +/+KTbbIqRcEYhnpQhQXBQ2wqIN5gmdRhaqrj5q0VLV2BOKNJKqXGs/W4DghXwfAu > +0oMBqjTd/mMbF0nJLw3bPX+LW47RHQdZ8vUVPlPr0ALg8kqgcfy95Qqy5h796Uyq > +xs+I/UUOt7fzTDAw0B4qkRbdSangwYy80N4X43KrAfKSstBH3/7O4285XZr86YhF > +rEtsBuwhoXI+DaG3uYZBBMTkzfButmBKHwB2CmWutmVpQL087A=3D=3D > +=3DlhSz > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/crypto/encrypted-rfc822-attachment b/test/corpo= ra/crypto/encrypted-rfc822-attachment > index 56fe3169..e7bad9b0 100644 > --- a/test/corpora/crypto/encrypted-rfc822-attachment > +++ b/test/corpora/crypto/encrypted-rfc822-attachment > @@ -20,33 +20,28 @@ Content-Type: application/octet-stream; charset=3D"us= -ascii" >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBACGKSDv5/rcwScSf9n33cZZPPxltQgxkDaClMGY2DARgebE > -9rpE2O/4eoaEbdu+2shahPLIbD0wuRiGVpMIIloNNucl3f15h1wXPZbTwK7sNxJq > -HycSf8sT1fkolmC9s9X0r5xHgk0G4klAqr5C3GOk7Y6wsHTYGqzDvBFEB0LvaoUC > -DANw48DehwaEUQEP/iaiYeMDUsOzFZodKZOlQWese2JPTsRwF7KrTl8C93MrZqAh > -A1pQjUH9cafj8mwDXA9ZCsYZs7r84IxShI+dUhinBSCq8F61OlLP859wq+wpKU7n > -PNVA5bfd//4hRFvDT33ZlgeeeCcRo7h4IDjJwFDYsf0Ysqvo+IKipVNXXlAcGYYI > -DVBucB0fYaVHWRKxw50mo02zKP2/GW6K3p1nxGTf73cKjc9of+VOvvMByODaJ+ne > -WIuzZMqz0vfQ0UvRVBjlsXtB7VpCqJZWkubqqwwP6+2WOCA/c5LC3z2f/BK90EQh > -/JrKfDR083UNhu4SjNwL/TF4ET33JHf1u5Gmzqx+eO00pfhVvkyz6LYImkE8ky/+ > -bXyJY8iDq7dxtfqhzZbeNe4fafU/avXxTA5UkWTnYhCqyd2bvAYH3Ep3L7lSv6SQ > -Tsy0jjTsWJoSq6jRIzJuo2mX2MBKPBfLZs4tH71/4RppECletNnS4ZlxiV4LNrWE > -LrXQvE1V+mJ82muucIe7w52nf3UWjQqTA73+Ml0aK+lIhbckRIovAw1sGzRrbTEX > -xLCgz7BYDMhs5mgtfiMAzGox4xGxi56Ge519vdbddan4G92mPlLl1IPOXkO8GyLO > -D4IiPp5ilPy6uThuxxIFemxxUREbPrfLJNA8W7aRPrHz4YcgZhrAV9I4C+xE0ukB > -i8MoJeFvbCGPyTwVDn8XfFKynlZYm1f8NIVMSj5JfV8J3Om9jzDp6hx+52iUQEbW > -C9g4kfPZY8h0RMggdOlZsaR8j26xuW+fEtz7ucJIqfJ/ElTH+4bm8MK2qPZniRWv > -ej2md4bP4Bo5DXydzxz7O7TBL6/Jsp7pJhHUUb36OnTWvInyg71LPT1QIxdRvXr9 > -vNhrEBDX3MNf7RyXczvBcc+cLRo+zV+T4b8wd2kwXskWgKrGUJEe2TItdsafaQ9B > -BkuVGu6cIDa6STyCJiOB68KIXiDuADSWJiiR+gZr4eU6vzfhR27LMQt/g+oPW+U4 > -1AvzUl9uXjTMC2vFuTQ4M2g0WmksCNpPpzOu/QlBmRqpP2Fg9UuLv6ITWeCxp439 > -g5NT5KXE2IiruL/DS0KEpWVNe4ayGzRvMawFuU582xbIzXjvilUZrW+p6req+oeF > -QWTWHGDojTvULQPV2c91lWnLaNXVethfF4hrM5MIL+EwVs3sUXFMr1kX7VNrK0QH > -Uos7nc4G9xngpdvwF4ImldD83O8qxOVzIfk5Dhz+etTH4HbnnDvmQ/FIYvjzGviR > -ZeVwdCjv/9TC4yY3nJFKMwGp70jVa1vbmWL68HVNRyAVwnQnu2UlI8UR43iVZyUH > -ZY0Nr0rbse/pvZyX4//EVOFLUR7K4GG0N4Kz41q5ZB8rI4Fl6QJhgIFJds13iM77 > -n+wqLQE7kllgI32E4U9B > -=3DYlXg > +hF4DHXHP849rSK8SAQdAtWMNBhjdh9Xyig/GYM1RN27B7LmCk0oRkguuFMROXk8w > +wLmcm3HiikqziJzlPY8sBLEx7cLQCkCrg6KarCHGvcqajUJluLAZgrwUsmUpOFy0 > +0ukBQ6EnlpNlxdcmOElG9ZYn2Dgp1Gq4eo9rHb9f/TBLxuTr1Yr0vZ5f38bVn+tB > +0FupuYE5h/PAM2JPjVg4rh1pIN2yWvNdFBHCm0Yt3AquS9bwQymUOjh0ZCey5ERy > +WJtUQ7u+f2Hfm5K9CPPqlM7GPqeR8nv2/cgJxsA9nGn4tco7pHEkM1Kwe1dLlTbh > +ZqEMKu+dVK/RqRUjDVdAonM7wz3Uah6HJH3a6W4g2mPiPPkOpnbTClCLiK0H8NRv > +9rbO69kHoNar0YTpTAAbkxlKkdKeM/xAS2UFIdE+tXSofeCHmsFCmcohKH7Rt66l > +rU7BJE7dtTiaPFYgHBuzbrkA+oH8gU9l7PQ1L16zo1rRVRb8IIBPSHY64Ekpy3L4 > +FQ3Ttg8e26d2X+6eGca6RIXksTfqOniC33Fal6gBIUqP1w4ky1wjJ+wujkSuf0QB > +yFWPP3o16o9X3nEIa2L8v/engSM5p7pezZfVJej/5hWnuPP3YmbDpn0ir21Qye96 > +qxq7XI7GSWukxisxC8WakNA1LHnXo5DvHB8wm3lJIfEfIJ9RHhZqyRMptC563XCZ > +A1NvY+4sKgx9g8PBRai019ZaTMYJRQqE3VlU+xHbJWMf4aymYyeY8ut8HvFhC9Tk > +4D3eol7/LgHhXA9Db4L5MJX8iHtXhqyt62vmMXcFzC1Wi8Co/HnchzGQx2vXnUIZ > +IlomEAvN1RZC2UV8q2NHKzKnfr43WfnIsdt1fQwEfQeTKX6wfhq8FDR5NmEeLeTw > +ddGA95bZEkT2xYh+2g7G1c5Z33l5WLeriA/SUMWK1oafUtcx81lJnmK/xSIg3PKZ > +jKIbTwv4tKjmGUJE5xb/RTUfOTG+v7HOBo0avwofvqz5k7Do8v0BEEmhewjcIKBf > +h2Go8VxFtDj/OG0J98PS3OVQtnv4jzepXUxr2ZW7Z0aPFUHQ2F97Yio3nxb7r7um > +OjKhNgIPp+iAWisqqw+kwWxPx/5GHxVYsOM+fqpFEjELGGNv+ImTG7jS1V5agqIr > +qU+dxYydDKnQi/5xXeE4TO0MEFhCIttOQARw3DPtZmjLuXFjqvaasTV4YyXwrKCJ > +0sfemg3wxkZxY0NI13g3CaJGtSzXdZVfkzpdVxRAZoETT7rLNDbawuq0AzSava2u > +nB/vgcDWfPr4jW21 > +=3Dr4Vv > -----END PGP MESSAGE----- >=20=20 > --=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D9060418334135509864=3D=3D= -- > diff --git a/test/corpora/crypto/encrypted-signed.eml b/test/corpora/cryp= to/encrypted-signed.eml > index 0345e3e9..f5d5d120 100644 > --- a/test/corpora/crypto/encrypted-signed.eml > +++ b/test/corpora/crypto/encrypted-signed.eml > @@ -17,19 +17,18 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBAC9z781zV7QAInGMKHX6TKU5Xw/OkoWXahpDL88F6Ocm5R9 > -7M9z2ocvlyrbgRhqE+nvFeGH/K7rVkBBT6TAcdIe/C8Qzbd3stPPcx1PlunGROj7 > -H/WAcmDksK3HkXpHwmInUtzNw1pkhOoLy/sFSbPvtyg8GCUzXbafHAIIo0rB2tLB > -DwGWD3l4WdcyQWuYD9QJKuDIqdWo8E3TTcKkiOAt/6liwPNZ0jGzDeCuSTnWFj6Z > -AiXGeNtD3I1tCN/8T3NjEKOCQ+bdT5Y06dDaL61FpQ23eIuSUgksVxjnkEAb6iPe > -07gjzcyNuGP3WPI/0qu0wtZwpAQxvaNygDsQj/OjR5kn9luBd/VqodM3TWWS8miV > -m0z1tYbqYAQWW6TS7fXlsyXoOxTLW5MCfe3D36VSErL/NJItETklVKzNfKjMmRKx > -CI2ZUzugxPWSLQzOp5yl7iICk8e+vS9TkQw2j0nXAQYLYgmqZMhf4av5GlFv3tQu > -heO4XLT6NBDTHMFTDbgW42kE0N4MDPc29AqVFGImcTHvflF4Vp0qIbSJdIcHwKkU > -5LKqvicAa0lsIoJbsW3lHrzowyjov2vLH/VGd/wIX+MS3KT7cySdyp8HVMcwwyZu > -Y9nrTN/7G1FwKWlcGa4uJNcFFkYlcEymZj1EX2cyrdezPtX7K5vhwBYddptFD+Bn > -IVkghRut3UDeXe83F8OutWiZfK5EVYABq/aP3//hIbQl2o4Dkd3z9m+8LobrIV5s > -NXjAjU5WQOjRLoHBebG2HkMpFsWhXD/Fb/Bb58VOpdI=3D > -=3Dx12v > +hF4DHXHP849rSK8SAQdAwRMXQWEiw2ZldkVtILgy2w/vFrKxAgAxFmyDGvtbiTow > +xLMHH7PgH+S0JIjEOM0jFglpyMdzvNBWII726THKbFnOcR38CsbK55lCYw2uhABS > +0sD1AU/yQZNNDwjuJT6wjtxMdfI4DaFMD5XTpioNtRcphLpN7MHbYr4MYCxszRY7 > +ZLIAkUCoY/3D26dcOkB0EMGELsRsPmKaCq/m3FVvxHHku94MzLnjV/eGRE40AiSe > +JzteAKwXzUAYzYw+LCj9WPZvy1Rs37I4VgukEgSYXMidgc9fUQ4yYKesbyQ8/iMW > +Ryo+X2yu7Iv3a7pp2qdArsJwatWpyRuASVVA7nZlNQS0YGh/fuSX3x8TJuSPliFr > +sdTVuE6sJIlqttH9CRgxMjLY5YbpF3lBTqlv2tmz0VERhWKKsh5VOiUvJvZ3p5hn > +FqnD1bcoWoBPZRNOoF6PzGkvWQIqysGLgg24wZr7ZRgZ8mHRgykBN6cmZHQKf16m > +zqqf8sppaRal6d/L72EzmeHEusUn6FlWcEDlXLc5anghYdna7qhbLqsoY7X504SQ > +Mx4tj1P4XVhgoXdLRR2EHOLrzUCrkiQ9cKfoAcUFJTcbGGYYiYwzUCkZWhsHOKsQ > +y7tajvWUzGaJ8aiZ1dfdUraOzrvOOif4TdnFJrTpM0Agy6IH8tbm8EnhNOxkjQPr > +3t7eS3JcuC0=3D > +=3Dqz8x > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/mangling/mixed-up.eml b/test/corpora/mangling/m= ixed-up.eml > index a09f6191..d4702798 100644 > --- a/test/corpora/mangling/mixed-up.eml > +++ b/test/corpora/mangling/mixed-up.eml > @@ -21,13 +21,9 @@ VmVyc2lvbjogMQ0K > Content-Type: application/octet-stream > Content-Transfer-Encoding: base64 >=20=20 > -LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tDQoNCmhJd0R4RTAyM3ExVXF4WUJCQUNwNzBl= N0tQ > -eTlPWWFoZUlya0x6bWhxMWxScW15NTFhTDFqQkwwSy9xTjdyZksNCkJaRUcxY1I4amVMalRG= ZFBL > -UExWS0pJODByN0ZnS0kweXd2V3ZsNlIxYUUxVHk1Qm5WWFQ5WHpDckVIN2ZxQ2wNClNLSzgy= RXZv > -bFhUb2hBWkhVcmg2SzY2ZVFRVFRJQUMxbjdCMEE4aEVyemtnYU00K3NlTjNMbHZlelQ2VExO= S00N > -CkFUcHFzRWJNMk1WckdndzBiM29Vc0dHQVBFdDJNbWpORVlzcmlLbnF3dDZkSkRaYy8vWHlo= amdN > -UWF5aUQ4ZGENCk4xZ1Qzb3FndS9nS0NwQlpEWXpIZjlPdFZpMlVubEZEV3k2cnJNWkxqV0Ru= SXY0 > -dmU5UG4vcW9sd0hWanpkSjENClpmak5DNXQwejNYQURLR3JqTjl3dXRyNHFtN1NUVzFySEFY= SFA2 > -OFRRVHhJMHFnSktqUFhOS1dFdzZnPQ0KPXBKRzQNCi0tLS0tRU5EIFBHUCBNRVNTQUdFLS0t= LS0N > -Cg=3D=3D > +wV4DHXHP849rSK8SAQdA4L/4ntrLU9OGEHy0JIryOhNPoVCN1MgZieW5E+1wDjMw > +GZL3EGlGTYWPhAm6wmDXsMHWMtuBVawUN0lZDuUoQtWzXYZrn3HiKQZn2ahfIrrs > +0oMBLz48JurPlrHCIHfsVa/YbfZOTun/TPa5zcjX/Vi0+FgOHEFCmHzK/VqlqsdW > +PYgQPvn4rQL25GACLzzJGrDvvJKS4fEo2p3pf6SGDFtBeyKb0AdyXoBWfXelS+ST > +rMTVqEDTT+71MToOcmYPX2QJRIMEVix8tCmvMkUXni8AjurehQ=3D=3D > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/double-wrapped-with-phony-pro= tected-header.eml b/test/corpora/protected-headers/double-wrapped-with-phon= y-protected-header.eml > index b05cb545..115019b0 100644 > --- a/test/corpora/protected-headers/double-wrapped-with-phony-protected-= header.eml > +++ b/test/corpora/protected-headers/double-wrapped-with-phony-protected-= header.eml > @@ -17,22 +17,25 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBACkvfKZEkuRUQ2ujdel8U2ufplGxE2oNOK+CI5S1O8cS9vE > -DIkVIXAtpZcCc31pYBTRl0TwCrLKFT/siYfshbxyWjMZjX/Jc38Yjg9pDFTIZ312 > -LoM5uH22f1X8O8020HgH+CQk9T4s9bBuvxTvJ6GQvK/ssnoYsGr9TGcjjh3uMdLp > -AXkkF76a2iimkq2163ee/8X0vgI+2fx6EjJJvlcSIlDcUvhYHIt8kjnlADSBMpho > -gaMa90baGlE1RAK9nSBC+4ty0fIlfsgcecRtFEifFRj6foYPFIFzkgwhRkXovouG > -FyXi8QrDVS8cz61I03PMVsFHo4FtJw9cAfvTh45QFGl+inW2pSvZyRnyu6uHDe61 > -NqUTJOVN4B+dFPbKafUKuJ4YGXLsDoQoE8VF0lwznA7AOATmqPQpp+Anq40C/4Su > -Zf1hGaBTuYjlChSTMxX+wV22+PQwJmK3tl1NQRFGlR1pQZWdNcu6/6RGooiVZSg+ > -VsmtZjgpZa8aaEEnrsIEVPfvbIZ4OQhmgNi4CYNB306UOjIh3/8m+8JmlkxPiGXW > -gnzNUTuwKytlZnIgT1o9a7PAkz+ZiHhMLmk5nPN+dlwsVN7Ff1FHqLIMbKaZbeKK > -txvhw7/NdaCALnjamqtDJTc4kL50F44DC0im0U9hcoy8X/HBrYkTGfHgRttCp5V/ > -XisGT6/rzyUzTi2usZpRtl3WhHrE0Uj0w2Bm/Qqe64vNd3F8xwuJ5qMZ3QLVxoX0 > -MPTajY1pLgfMViqLaLV8fR8hLmattxaO92sbVuxHiaba8er3jzO2HfmRLqesio7u > -8FXZQnBgeqBkoRlrHhvScuZLJVU1I4UHd9s3mcR+IY5VvjxdPMcnxTNqcRB/He4H > -MrrH26P0uSFe6WJYQVXEDt4OO73ROyFZE0+rSw1z+VnjmHVIzUVvvFqwJZo6Y/0v > -1+3ab4TGMPJSkfQYHY8/O1RF67BNlA=3D=3D > -=3Dgizc > +hF4DHXHP849rSK8SAQdAhuTX3AYQs007gCtcGsYQmtZg5DrD3ev6Dm+1Fq9vfjQw > +bHP9+UKDAmWL5XW2+zlFQVb1CcWn8QUXwjJBZvHEpwyxRWJNYqNlhsnXsX+5woGs > +0ukB6Jq0OJydXSKubEnI5Bxs7UC7rekUfxUH2ij6ZXmz5Xyc/h5rF2rJO1uaPVVx > +LuVOF+ZX0muBzegGMiUtunHmY0Akis7m3xDl2ZRVViRdW+LPoxb4oAGoPq5LHfHp > +5adDtrno13K6oO0NriVEPsSl6xFCLXOqTj600F8658o16yA8fiZj4kY8G8NunmMD > +lN4UNw/EQuWIe343dKaQo+iH52atihw90OG4ahmjvkhBC/iIiXZ3J5m10VoJ7Sxy > +G6O84UW06pCAqvPmkjnkgpflGdpM3Qv66Uu9ss6jAnRLP2LVv+IVWrwle/Yp6B8V > +1adoFUMphkp534vTR4v0xJ/6WaI1YzIwlT2zd2zCMoqwT5weuX509pTbae0iGLRG > +Q+l0ImN4AxsUdgWIW+GtMn3GVWCXk2BDLcr1xkl5lJVlOIbIvbpTwqYFMVAfnDGc > +s6JZS3Bwg9bfmxSkM4GhZlDiCdZE7f0IUBSnRRHPcMkaox0g7ibF8aG0himZRqhD > +3z6gtPmWO+c5i1iV6pQbntB7MY80vprz7gzmvmadbGFS+A4uCaH2afWr1eBb6nGx > +W6deJxHaCQrrxujz20y5osSMhdAk47WPkZhphU/8ERncZ1F8aYJhUprAbKFxNjt6 > +I4p8lrfAe7iM4UxqtSfVx2rPV9/Nqm8rFVH5l4f/0P93qsBNdF7rVQl9Ry2kVqkk > +86ct9ZK2QrOtsnuSYFzhlaDo9pOHkhlMOmQXAgSb12VP87z65NTYRGbElypmQl8F > +MXMxrljqnCbPaQaPq/37GEHTRJ7rrUvCQ2L6Ljp+F0m555eYHNiZRaxYA17uABOf > +RIr5gfB5ICmnH2EGIYiEkSeX3k8+8xHffrzTpOAqv/5oJBDlRcu6qyVSAumNMPYX > +fKqlNDhKh9xmK7K88vWwTgeOBm/sOXcfuAkr9nXqDqdLHb+duLiH+xjvBdl+ewTx > +gpzIkoTSsd0fgmNqmmfwmmU4oIQu4QX3/zh5HiQS70xogRxxU3przSFrrtNkiSkI > +Oe5fIqQ3tlUSzutTEoaSxeU=3D > +=3D4vL7 > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/encrypted-message-with-forwar= ded-attachment.eml b/test/corpora/protected-headers/encrypted-message-with-= forwarded-attachment.eml > index eea66a94..d43331bd 100644 > --- a/test/corpora/protected-headers/encrypted-message-with-forwarded-att= achment.eml > +++ b/test/corpora/protected-headers/encrypted-message-with-forwarded-att= achment.eml > @@ -17,17 +17,22 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBAC9RgjF0vsqVqHMB8fauhazs2XoTMKkANrDS6ECANm0wcvO > -tU1huRepG8ezoow/OgZ0Yd9y/zw6w+Frrx1PhVEr01lQsUdRq7INq2FRia015Q6Q > -eOgSv9Q8wg4Vcy9XD1wI2Un71nDvbNwqx+hiR9m8vhiWfXH1MvxVQUWcUocUMtLA > -uAEB+fx5ag3Qr42VAgyymvNrHJKtuhdj7CvdT/a5oVbZV7ilflFlYms7Wq0jSex+ > -Jrb+/CnNLow4LehrOpf+IfgPumo0nBbseB17rAM9vtjNy+tHEqPsB0YFIpVR9FOp > -zJITbWeFyGbOd5vMk9xbEFbw58JR8PPqsYJK41RleU2QoPEO69hoV0tXzjby5JQZ > -2G/SrH+m9tggi3rWxHx9XuNKJP4iK9wZnO4k5DFaUXq6PGCYkgDi/K1RuUcJjcv7 > -ob6Yp/cTLxHMmIS9VNNjUnnoaD71ndzYsZoaI6MTMX7/4eu5roeE3887NU5af/wS > -ep6POG8WFJzKwc4dvAPd0NBVojdrftJkYKONsYL5KN8TY8SqUPxiXReGwg2evQqb > -aGEU02zdRGYtmNSneGl20dJ39cHoW7B66ek9OQkgilSHQq4adPleq07r3HSv87jk > -xNYoQ7xH2fahqbosW8N5uI9L2sdGVmTBNZgejiNyZoUn47tFEt4Uocg=3D > -=3D/ZB1 > +hF4DHXHP849rSK8SAQdACh9CzQl7cqCVO0bpHfyqL0Kr/V2TtUO68yhOYuMMWXEw > +v+aH1aLYervLMNDSC8Fj6XY9myqaybbOfHnLZIQg0XkR3JIKhWR3LpZtfpFGSr/H > +0ukBgdihDN26YqD+UETkBN0lg/fd4+cvVyOJSwuU5DQFdsOk1znvEercz1UVpKxz > +gg1lniZzRYCyPSl9NcZVtNXggz6z9XqxT0cVE3WCH2IsVrJPfgnFu/P63pAhp43X > +IxJe5mB6y5eaX5Dcvj48Z2E+3tVVn1gKGwLzPH40WIy98KM4dv59I0ZghM8h1dVr > +LUUgdiz17fo5oWphzdgn57ERk9B/pApkzujrB4Sum9qy9y/Q2DWFKdOARNJSZ/Li > +KZVXZLVEyp1WeAU262blQRtqWXq30wU9PazFo3wsUUVoLCu5SWsRpircSIWrh3gH > +iBE/YdPYQNJ6kJoz17AdIq0a4jH3ae881P6eBW22zMxdqD4zfkT43iVQAtuki4JS > +iBJ2vHoMU3z+rJ59ea+P595QHCGNyfkgl50e0E8rh9j+9/CExyD6F4GwAZe9VA6o > +hYFQ3U089Cp/Cd5jVojUWIAOWqwb6nB7w3SabPZIbhhJSBdQEGe4Xh3TN3k5cpLr > +TxDJz4zf220EQ2pt0BJwDu8fdskMXC6ytQettvR46+UtFOOG9eClnAFkgeuqwKmv > +k1YyYMFWQ3Bv/IHOFrcu3negBQpP4ln5px6zggNoeNLzaZ9PN9Y2lHnoQTkw/93L > +qyjLD+xEnzgdPYZvVsNA1iI6LMrCandDwKySQyfZadj/G3/nLFcoThvn03NNUyCK > +Sh0Vy2gJhxD04HF8nkR/E5MLFCQ3x0qpGbOoanctgs/glxCpnzWRcSZERlilQ+3Y > +0r5UkO5XJU3Z3CP4uJnjykgB8Qjq/WzERgOtOQ/bVaWBWkKzxS/Pj1sJ47kKMtBJ > +3r5LXymlkA70RA0cJIv1F/At > +=3DvLN3 > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/encrypted-signed-not-masked.e= ml b/test/corpora/protected-headers/encrypted-signed-not-masked.eml > index 8dfd7c39..9f0e51b9 100644 > --- a/test/corpora/protected-headers/encrypted-signed-not-masked.eml > +++ b/test/corpora/protected-headers/encrypted-signed-not-masked.eml > @@ -17,18 +17,17 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBADAJ03D4w48sefkQsBWXUc1spTljROjVN+y5a2yCKtYMt3M > -wWMeQyem5hwLpLYRCfeIzXCrlBfpZffuOkA5okGGVEWFvJ5a1kZNZnH5Wg0ccBp7 > -KBGnJY0gS/BlrKK2Sjmk9Z3ww7GAgDGPbc7mc3Csj9G38UvneBdrQgm6kZR3GNLA > -6AGLN3KJETruI3Js6++aG+7tSkJ8Vo4WCVUR7oQROwF601X0QF/XghCoJCrx8B/1 > -cw6Yb2wQj2nv3gw1rqWVsPVpAKsMc1yHx/2Vsee/VPtt4f67fSAMuJF3EJ6JkcK7 > -tM761v69GoJGgvsie45pb1N2l/GfVMuwWU0wZhEsF7eXxqPzoE/kIGX1XIqleLaw > -On2kPSM5RgqV6gLOcw4WaFPi0oMbDhltNs72SV9cV6ZhhuwEQRq+u/K76NKLwte2 > -R1JutAiuPZVF0WanmmiN6RbIpWOB5XxQfWagfr4vcf/03TaLP4hJMnqUdFMk20HP > -eI8TMQxkfryZK2Z6VxEBVdXhK05VEdkolmc4j9U+76A96Gd5zbYPApirkebmZatS > -X3rKKAiBqwWrFXi/7LNDoCwhRRmqDuHXruh3vZEcz+xiPfJh0G31GJQgIpE15Sv6 > -trf20u3CXAFjHg9zPpSFV7uAOsqv7bg+xtG9PgN4aLCiVbXHsT0z6PAz+6K+SiKw > -QW8ZOtLikj5HyLAz/TDcsIShFaM3QHk2qq9RY10kmxlQVrf9Oyh3Wmc=3D > -=3Dom0O > +hF4DHXHP849rSK8SAQdAhRhcdC3r33MMW+D1PgLAoIhstxnEWOjI0s5wyH2gKTIw > +ceJ7nVvmnqLNWbEaoLp2tVH1+cI4guvgqzV60BoxNU5G5YMGqzMS4VQ47N4BENmn > +0sDEAWcBT1+PGFlXAeotmryF5ErMXesEVJJHru/KHZxsP3wwRp3qZjrwIWVgVlVo > +SpJJ+hwIRqCTbdsw0ejKY0+BJwQ/z+GPmYkWE+ARxkzwMzfA47PW+iNudrQNEJuu > +ALnsbyVX0/JA6E8jhvIA2OHb6G2yqFA499I6kWiSkT3m2SikuyKGybwWbaUDZVJW > +Y+JN2L8snDUHJKfl5JMhAgu2+fx/joE9PxM6fdx8rJJbpmTrPqrYf6vYyuq5BGYV > +snGJozwiN/cqR+PruMT7i5/Dhs/EDl3Z9D8iH7FEDtIzpSJNvGFIHetXC4JXgO7d > +C48g+0uuUL3SSuZviz+OgLJbyDu1Pc3tCrtBUs0zYJGio5ghJljU5tUnCNhbBwd7 > +oWgYxOmSzbZrs73E5Lpvnq+juZpXSGNoYzaZHacp2FTpo0LlZ2k6o8kx6eYfOlHs > +JN+43CnzTnR6eZYkfjIaBbjYKi0rMH2DRJjMXyeYRLjEi9ET2fFX3WWn487snIjw > +om8EPhsOxQ=3D=3D > +=3DwKPm > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/encrypted-signed.eml b/test/c= orpora/protected-headers/encrypted-signed.eml > index c97d8c3c..f64b99bf 100644 > --- a/test/corpora/protected-headers/encrypted-signed.eml > +++ b/test/corpora/protected-headers/encrypted-signed.eml > @@ -17,18 +17,17 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBADAJ03D4w48sefkQsBWXUc1spTljROjVN+y5a2yCKtYMt3M > -wWMeQyem5hwLpLYRCfeIzXCrlBfpZffuOkA5okGGVEWFvJ5a1kZNZnH5Wg0ccBp7 > -KBGnJY0gS/BlrKK2Sjmk9Z3ww7GAgDGPbc7mc3Csj9G38UvneBdrQgm6kZR3GNLA > -6AGLN3KJETruI3Js6++aG+7tSkJ8Vo4WCVUR7oQROwF601X0QF/XghCoJCrx8B/1 > -cw6Yb2wQj2nv3gw1rqWVsPVpAKsMc1yHx/2Vsee/VPtt4f67fSAMuJF3EJ6JkcK7 > -tM761v69GoJGgvsie45pb1N2l/GfVMuwWU0wZhEsF7eXxqPzoE/kIGX1XIqleLaw > -On2kPSM5RgqV6gLOcw4WaFPi0oMbDhltNs72SV9cV6ZhhuwEQRq+u/K76NKLwte2 > -R1JutAiuPZVF0WanmmiN6RbIpWOB5XxQfWagfr4vcf/03TaLP4hJMnqUdFMk20HP > -eI8TMQxkfryZK2Z6VxEBVdXhK05VEdkolmc4j9U+76A96Gd5zbYPApirkebmZatS > -X3rKKAiBqwWrFXi/7LNDoCwhRRmqDuHXruh3vZEcz+xiPfJh0G31GJQgIpE15Sv6 > -trf20u3CXAFjHg9zPpSFV7uAOsqv7bg+xtG9PgN4aLCiVbXHsT0z6PAz+6K+SiKw > -QW8ZOtLikj5HyLAz/TDcsIShFaM3QHk2qq9RY10kmxlQVrf9Oyh3Wmc=3D > -=3Dom0O > +hF4DHXHP849rSK8SAQdAliiUK1XTMeUUmjJ6n4yEEBGVPmQuVTD4wdJZx4r2J3Mw > +uSVIq8qBJ7NrZfvDa63807usyKpk0Io3tdH83hn3wIKKmUMTroaRZMP1BdJ3aVdh > +0sDEAf18AhE5POknHzzolNbTXmQkPNspdNpu0ANdKkukvUZjfWvssZ1WN3jB08Fc > +Wr2Byez+UyLggj1bm+HuzbcZGPfyMOpoajFG0+yK4Ccqpf3XapNJn7v1ic2QhR/B > +pmWpJR0cXDigNLYQ/RoNEiSur2+0hzeVkDiYQtDYD02Cv4rnhyJdCalyriRaLOZr > +4Tau4xfK9PdOydahZZHEFllDU+yfEb9xtBZ+DEGh5AyR1/sG8ORnJc+5m/z54zmJ > +W3MmZ7M+4O1q5l5MbDwHq1TrQF5R9JSXyeGTW2XscsIPdvY5bExMwyMoW/XY4E8+ > +GJ12UVpC/EWt2Nisfx2LhIoxtwaZm2r0Xkt6hY5DSMkpHLZtGPOOe1QxtXF1qXH2 > +owTZynRxlmaWslOXdhtFRHyfGiFK4pNoV6fVB0e2khKKfXynN9Zx99GJ+DoJsOFT > +AYOadP1WlbIbSaimv/xSpaijE2XReKTLfN6aK1vSe90r96nCWr31fcd6x9ax0nVx > +jDReMRJrHA=3D=3D > +=3D8mRD > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/misplaced-protected-header.em= l b/test/corpora/protected-headers/misplaced-protected-header.eml > index f1a72f0d..c93ce0f7 100644 > --- a/test/corpora/protected-headers/misplaced-protected-header.eml > +++ b/test/corpora/protected-headers/misplaced-protected-header.eml > @@ -17,19 +17,27 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBACwbgx3N72gYKIU63tNE6kf6UA5ed39VFXh3zdM6eDdA0bG > -DWt5yROckkCeCvMoFaRswK8MiX8aGG0GdH6VKhyn7HjT/Dm84QLwoB0ccZs3MnwU > -aJ9yTC9HbX3yfTVZYOu0w47NZho/LXX2Yd1pi8OUgrPg44fjgvx2kNRQ9EsNBdLA > -/AGMhwwcTPHjyWQ4XYZoL6WeVJfq2C0m3hQ3bxrKuAzW53HrSa4tPCXzX3G8KEz5 > -sSk3ZOmajSvLde0LG8bxwexgAHC/Wd07e2HgHtZ/H+Cw9oYLgwcgVyXg7sGVrMrs > -IlwW0Njf93DJmJZuTD8P9XJc3h1VzKA+YhbtnofFZw4JexpHcC+R8Lcso16Mkp91 > -7Ig0E8WTZ+K+judGS010b5ND2ETyc+TYY4/XJ2R90pbNrRLNTFG+P2HUob6PBCwE > -rXot6TeBSgm+k4bvl9aMKyrBSplKktQey4WsdblbJnJUxSl/rMpW6xwglkyIgrCU > -vbhffqgB8y1JLmK6Ow/A6Pzi3T6Zn95zu2GN8+yAOzDhGwlAfIV85TYnX6ybOkX/ > -Amoh7qNS17pzc6ch/mif/RsSPYo+y2UQuVFhG+kOy9oGAQOOHeiCWZPa09o3R2Jn > -myMg1FPgoDgsjE6QpD0mx9ORdPGC2e8jwrifS/W9eHJ2QG+mNkcKlAr5b8WiUTkq > -hEZ+BaaVhbXN8EuHHTJT6YojusCIsXI0BMF1su1KupQw+dwQnys8wuy45Fr3H58x > -zqHoU9KzdQGLbeJTgA=3D=3D > -=3D+EWE > +hF4DHXHP849rSK8SAQdAlqPAqdaaB751ZhN8drQheW77zbyPrbofTZgTa/32UFow > +ShGDg7SQxQD+LssHmGT0g4pUPo8JGor8BIvnvcZa4qRiZJI1i/VWUVoLc+TBT442 > +0ukBxtUeKC0V35/zRgS1ZXrbkiBh8TGy0lee/eM9yvfT5FmFhotzoQkexDSEPxjb > +g8Qr/IcH0v2XOEmHux3hQpngY/LRYoCv1c8Niu2Zfan1p7zefOZjAxRraeihHi6I > +KyyA8WIdiIac97vO1CRyXXATJabjeijH/BaUDlPvQ39c9Mdie+HeaVYcaC3e9oW3 > +sjn8fN+KjkjLXwPWhgMDpvP9f3ZD8oCHkN7Utq4OTwz8gb0IbUIkElF4G6O3AckV > +UXwrASodKBL58IWYz6VWhyjYxoV2R2hLNtnQWWvKgYzru2Mdb/ONZBM/JMXMjFUt > +oxDJs2pb2sun2q6n1sWKTrS9MXbxeFEcp2v3hMXrmP8nLeNiPJ+HlerFCSZasDOm > +c/3X97zIneJUosm3ltqLunSSE4vp+FAGIRaibMjyE2u2niDReINxX58E7o9cfJL0 > +9Af6olZA1gQ/8t5qMei5qTN3wi4a1ieqTN4yD4v7r8yZE5PmlQfyY0joXVepm8Tx > +9/rDLM/gU/zogoo17enlU3ipvLZKsVDkLIlv2SdT1AF0ROnjLBGJ2iWzKst9Rg7/ > +mXzEqv9CSVM2lXd3qUqra7reeaVD3vd00zmLq3yM/2sHeuLAc40R0MkIOSa89eRP > +iXu4k9+/m4WU4bNPugaH8Szm7OuLQNoB7mAB6t9GJGq7Y8DKxMn5FSUwLtKkGkUQ > +YdGCw2/salvqoQIDJVMteKpM4pWi9sFoVbxAU+djinJejSjSmY+iKHcMYeQwOpja > +33+W2RM40JOUZ7yc+LzgWy/ahyD27cdS1TPaghlQxPeSjcEfekrjgGW+2wIMmCxy > +xyMPWeN+Mf7e/fNh6YDbld9BKk6zY4fNVWlC+gR/aMVapomNgW1/FS7F7vk5qY0Q > +pAf1GS1YR4pKpo3sSEaLHw5rhpI0pT5ZvB09+GYRhsBQzP3LvnBCsxcVvi7yERY2 > +QVlHejpTWwuRcTQCXP9UXa7z9UhEOieHwy6xNRTi4HVWHbXMxVunvlUnBCnQdFIr > +s4bcOjY94Q29FeRjaweYIZBUSabXDLJhLZNH1u6Z9Z8dBZ6Th1+ou77m0rEN6B3d > +mf83pKPrOR8ASw88rRGq8O9yVpFR4mD7HiE7YNofsPBtk0Cz178WLCi/D8b9A80h > +R/jVyxLmrCPHQUFfu46JgytBta+VBYwnYFHDynnYczuB0gydvuPJ4cJvfn3vPA=3D=3D > +=3DDmA/ > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/nested-rfc822-message.eml b/t= est/corpora/protected-headers/nested-rfc822-message.eml > index 059783ce..4d5073bb 100644 > --- a/test/corpora/protected-headers/nested-rfc822-message.eml > +++ b/test/corpora/protected-headers/nested-rfc822-message.eml > @@ -17,16 +17,17 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBADCWqobSSS78XdrxhBh5W01OZbUMdnrwrYJsiG9fQoVfFHN > -eALvOfviTcSBD97/jO2IRL2W8hyF7k1BVAYMwSuxe4qLbLdsxK1i4KBRIFRkm990 > -ipBddgFXV16WNO2cTK7boEJ7Xfjp/zjoS2z2YUXsdGx3OSJciyHBVJki2UfkL9LA > -egHa7dsw6BxoNbAkrD+ijVbsFrKHeeJIlWkNbSYOk/YLmqLAEy1CYvSvC8ZSBtQT > -fVYc37fc3RB0vQC+Vu5k5d/I5Z1/Yz+McBJDMNvcn4yoFiXemY8YVFvj7iC0sbuq > -lwitvgMYaljhb8RUQAa3Dy08Jju09DIBcCgRsx32U+3aqZ0MhU6CRgt8kc9oK1g4 > -yBVppqpX6hCXjtt9LUArY3DIchRb+IWTXsb+eDR700GXDyNMk1G5WUl0eLuw75uz > -EqU5Tjh36fP0ceMESjaxuxyhhw1jjE3ON7vqFQRVcs7UtazbxznWQH3Z73mDmY3G > -q9JGMOOqVnnFdnEq8vDFF7m+Cp3N1ieyXUXjn3aLtvSRMmVV20Q5QXSFg8nP6juT > -Yn1xZjqOodSeig1ITZZF58Whv+LHGtzDHwV8 > -=3DcNYF > +hF4DHXHP849rSK8SAQdAc+vNxgvGe1T23qYt8zZ2dtmU4+DzCiMlKBFrI64sICMw > +foE2ym+RPLXzL2SbgDaUqgYbkiKmo6HrFSURtlDae0lFHrmLYZHToVWXF14DGsyu > +0sDgAcsIt7i8j6XWpAI9slRqjDAEPBp+4EFJKL+BdIuEYa6z1ULrv5BUimUi6D1o > +UE+k49xE6iFOpgSEghF1+ZneE3bj8rqJJwA+sAjth/Kp8vNccA42mCyn3Avxvk9q > +aMw7GWvTRJ5oc+RGo6BZukQtApQTbLzOeI92w68XNmQaSq4+LKUA4+CTZpasR/WA > +CR2/MWfwW3vmZilPbW2249Nj8CAawaDxTsIY9i5bHE0HjbfJhBBNffDPoNCh/+Pb > +6wIZ9/6xLHAzxFtY+qvDhVO/nWOLrdd9ACZudoD/x4qITc9IFo4F8bWF5iKPs67q > +wtw1qFTT8ODc2WWhOizDByOkk/D+Z3mrlsOC/x7ioho0IIeWldkfaET2ucc9FI9S > +SPX+huu6vnPAGO21T4EMqevwDLNGWMQBolHSlU3SRnNyU1bqUNDF+/9RiOk/NFj9 > +FTwMj8FAI6/q0kZLQUF34h4BPF8/v1TmVZKniaVXqQIE78MvFWXV4FXYvP4w+IdK > +q634Ah+cC9NVEB+U6H4aSB9IojUurd+RvD+4x7rd+EtLFdc=3D > +=3DHmgM > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/no-protected-header-attribute= .eml b/test/corpora/protected-headers/no-protected-header-attribute.eml > index 880f60e3..cf786c02 100644 > --- a/test/corpora/protected-headers/no-protected-header-attribute.eml > +++ b/test/corpora/protected-headers/no-protected-header-attribute.eml > @@ -17,13 +17,13 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBA/9GY8NN4NDwpNttr/hTXpS701Z8TDr3hC89obZNnNpYxSct > -p+YkS+FsPMLimIDfU1meG8R+YgtQOJIhmKPHW8CLQ1heBsX0Dcv2oLxXodqNGD7M > -/szVRR6duVnALPgmV66vkcBHKbsiuv8EO86C7G1hAnXfs0H47WoeUz9dQ6RaHdKw > -AVbxw7KWVbiP+S4SO1rvNsAL1xiRPA0FFmDRMyoFRC/618dGS6HitkD0UR708oVt > -PooD4Rk22c8b549wvZ88flGk+WBCLhyXAuWYPHwag1DLzLjWH5r+XmK2O7JoQZeq > -k7JM/M8QM+xetFaPmsWs52IynhXyWpXBBanm9NEsNEiIB59480D7tJ0oivo8T24d > -izSAMGATP26ReatoXltCl9x8uUfUSAjWt8iJ1+n/3ds=3D > -=3DhGDA > +hF4DHXHP849rSK8SAQdAQd0btUvfUMmCgmDv3mG8d2tfmr3MYsOdE4TeSqk6sFsw > +8Wsp5J4s2t9ua6ScvqCVtlUVUL4Z6BsACArwy0/XwGQ8JQ6BUuYH7JSWb6O6tzed > +0r8BYDEY7/8+QCgXneo6k3wvPHrzTsvg9fxmCSTbvA+8JCrEzbvM5l/wQmSDf18x > +difPsrCT75x3eYgOy7NNYIAg97teybVWZ4raPQ/SdJ9J0TmPTjQF07HPndrsYGQC > +rEKvu6oq2/HL4NWOWMNNixs0u6ALRpPuUUXKgwSaZUG8+juOZ3yFe56bd1IvwkWK > +ZkKwa9gBn7WA+eNpcJauux/ta6LuXiNvNHUGUnd9puVepi9GO3XAxYcOzqF6ly1V > +iw=3D=3D > +=3Dc3OU > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/phony-protected-header-bad-en= cryption.eml b/test/corpora/protected-headers/phony-protected-header-bad-en= cryption.eml > index 15dc08ab..d0e11a10 100644 > --- a/test/corpora/protected-headers/phony-protected-header-bad-encryptio= n.eml > +++ b/test/corpora/protected-headers/phony-protected-header-bad-encryptio= n.eml > @@ -18,13 +18,10 @@ Subject: this should not show up as a protected header >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBA/9ZaOuxGtLVWiA7KQfB+4td1AILd1uy039UDb+9YwlhmJTq > -mNqVJu+ZkFniZPMliM0z1QRBkBeL2Q7MrHAdYxYBKrDHKVja4O7jwqeKjy5BzQCW > -fnyT+sb2Mh+dz5P2voF3XJHgqzhFY1rtVEatXSZADwwIVU6oZqGZ8GOELNGSd9KX > -ASNElH7WGZB/TQ5X+MktzOLExx5QWaRK9skogI2RRoOquS7KpMcjzb2FWaJDjr1s > -hd8FCQVjWuUDrolMGH8cgeq9iUBlHMzfPY6/jeGHNrjk12wwhBNcq6O95uzXtIRS > -BM2xnwCYec6wYJ46fHukTgv+286nSQcV0XT6a+qM5GMgV5DMHW2vSyl6kTszJ3EP > -xvQBfPCItA=3D=3D > -=3DGkxz > +BADBADBAD49rSK8SAQdAeybb8KrIaEFV5+Ks5loaz651PudVdzS8ombK8EW7Mnsw > +kEppTiE4jo6ZocHvhjSzPdEK4MPh0qmKvu1RrHa23dc1n7Cutg1FjOb6ZRloTisz > +0jEB3YxBhFDBZyWSGeAeZx93JaNcV6CBjOfZ6GJhzkqmSs73VdwFUWQxcoV4q5sL > +GYCW > +=3DBADC > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/protected-header.eml b/test/c= orpora/protected-headers/protected-header.eml > index dec822c2..a10612f9 100644 > --- a/test/corpora/protected-headers/protected-header.eml > +++ b/test/corpora/protected-headers/protected-header.eml > @@ -18,13 +18,12 @@ Subject: this should not show up as a protected header >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBA/9ZaOuxGtLVWiA7KQfB+4td1AILd1uy039UDb+9YwlhmJTq > -mNqVJu+ZkFniZPMliM0z1QRBkBeL2Q7MrHAdYxYBKrDHKVja4O7jwqeKjy5BzQCW > -fnyT+sb2Mh+dz5P2voF3XJHgqzhFY1rtVEatXSZADwwIVU6oZqGZ8GOELNGSd9KX > -ASNElH7WGZB/TQ5X+MktzOLExx5QWaRK9skogI2RRoOquS7KpMcjzb2FWaJDjr1s > -RGboX7NG3xCvNUV2ByFTvLOeo7eO1GfUsabTUbMMvh3AE1UvHgCu8VJiRrMdmPln > -BM2xnwCYec6wYJ46fHukTgv+286nSQcV0XT6a+qM5GMgV5DMHW2vSyl6kTszJ3EP > -xvQBfPCItA=3D=3D > -=3DGkxz > +hF4DHXHP849rSK8SAQdA3xy46BwN9R4tHbyAqwTMeOSfrrNzqsvCT9hqcVfRIzQw > +ThEINU6n9x5QgU2L/mtSaAMkw7ikOmzrJkvjEEE913dvUsw80+Q3QDYODETYzXBN > +0qIBrEpD0pYlXiQECDAYqox9JBkOPi3K6c4TLdACG2q7oOtHzbApzHC636oOFAXB > +uhARzvr/TN5/Fr4KDM2j4LqdsxSwE2mOJn4lM8EfPAm0jxbDmHKOpjpk/QnKR7ry > +BbctXwYIwlkp6voRsAJ/zG3XcLpbO/w+a5U14P6qCp2RM+bNWKtZTT4Gl0yCBk3A > +CYGvWb797ZA+5BhraXCWAQcscec=3D > +=3DWKBy > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/protected-with-legacy-display= .eml b/test/corpora/protected-headers/protected-with-legacy-display.eml > index 8c5dd251..9a3c7644 100644 > --- a/test/corpora/protected-headers/protected-with-legacy-display.eml > +++ b/test/corpora/protected-headers/protected-with-legacy-display.eml > @@ -17,24 +17,26 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBBACkgwtKOAP+UlKYDzYkZY+gDuMNKnHjWIvv2Cdnovy40QzL > -5sbuib40y7orO+MqYMCWpoFtgBVsGiOUE3bZAg8n3Ji38/zVGwQveu6sh7SAy0Q9 > -zFEvLhtajw17nPe+QH2UmIyfVikA57Mot13THq4i6C4ozVCyhyIltx+sNJkmw9Lp > -AdQd+cgCMRSMbi++eRwIi4zgxKrfAoGOmdMiVzBrh3yZqnbI0rCxJIKu7gEWuQLT > -7BuvN2bJUkPGLAUhUanFararVoD7WWOl67IlWFkyncES0PRskUf9coV68WZnYjsR > -Y3LdLnha1sdMwUNeBKQ44XBd2e7mXbDSp1cSjTDf9euwB4m7uQFTLwoQ8Of+LmQD > -KMHzjmucbkNAIpfAjcDusTA/oaaqUiEgGIgYYMDqG1CaaxdT55S7tMjW5yJryQmo > -pg65jrUMgEn5XHZ+KI2OsCmwGdoBYNau8p1a2hsiKhHJmLUeEAu34gFI3hylIOC0 > -0KC40d0zTSb0s7SZuTrD6vYgiXG9aFktHvAWFH0ATCts7qyiRN7k5jt7yWfRntE2 > -UCexTGE3TH7aju+IqDPC1XsaKF4T3CVhdr8WmKCa+0VOaw7xHRGYnzq9y91GcaCx > -8AcoZ3kYs+f2LIn+T667A0KKP4Z6OmLjCx3b1RvRUQYR9taruEMAQbIuAajiyTe9 > -KfUrsUULZfInE50x+OneYvDhzoSgSJoHIK+18X/wo6YcyleJ9fZxCQ/vaXTDkAeF > -ve7TFcbIqmJ4MHygXILHUuDwp7P4t/tIL7SZwja70P3digjsgoNZY29VTnU8uyIb > -d6eOjgpeNVhRjDWxbUvhFD7i4rHCi/bbXFlW0cCXoiaVQBtYmiNysRoRZOv0h3TW > -q/+/UmqkaQFnF3zp5sr87y+ValItgPWmb9Ds0lyAoSvQx35zVh8DFfH04m7hmsb7 > -gcvemlPTAnQWkIMC3c/bZWgt8tNcG7tQeUMWd9n4281y/hApbm90x2NLzEqvVcRq > -K0iIgVxbCHSKqGh4TtbIwpNhzSP+KHYkZ8h6+QUDRwGEV9QqZKg=3D > -=3D2O0V > +hF4DHXHP849rSK8SAQdAGiLZx0/sI1uoQ27OPpwunlzzlY7ba4E2YNU+AErRA1gw > +YYKlhgfzSgO0LpbxHJfithVAkrGYvj5HNWGxriXEsOyfy+Ax0FtAJuzYr6DGKGx1 > +0ukBxLoRfWuoo2C9gXwojieSI9lTh7V+FaVUoVmTXhd/WFjWLtHbkIVmvXI1WVyi > +wM5NfDi3Ho995P+DMZxTKkdqtbdeYgUK7oCw3FHsYsNSTf3XFazjEvHg/TvOWd5u > +m9SbZAKfOBrEGGCzNHfgyluaBKdzVX04GPfZ2GblHlnU9AnGSWys1i8kxmuQYAKp > +UrXDlMcVB4V5bcGd1KMvGyhnKzICXWhXiJhEiNOc+uhl97jxXRujflfT6S1+8thv > +o86332XixGu8o5svVAEWobN8LUXpHZZlnK9a0Zftf4v8ATHEzQLAa5vdx+BYN8ua > +e4dmCtxA4XCfRD58FJ6EwjDqhv45KYnJP2W5eZujQ7Pl1m3HJXGwFQmtnOSB/9dw > +M+y1Aif07VBYE3LmUUqmS0HLZoqmOEoh6rKldzyxFmtfZyn73n/zcUoQblEWTE7z > +lxIqpCmo8jHPcs1tm9QD3sUmqQ/YXwmqZbD3pOn0PIXZKVY8/DaeggMWKQ/UhCWa > +7Z8g2GVq17AjHsS9n3ShDhf6B/8qI+jjaZQqH0W6KLmDQixjf1BoPnTrXNjcloJk > +uf0YAuol05fXNAiyPbFNO9zoFPxm8ZVEZG9nbcnNOz7ac/Aea6hqhxHnzNFPU09K > +J92FZ08XXDlrt0jw11Z/i606U/7kX6Zy4vCtZjGB4h04msBiLQwI0POIcY28SJ0U > +W1AqcReye6lQTz47AkOKAfVQl9hQP++G7nZXlxUQ+z0VRqBEqd/QJdHgoe6X4ctd > +r8093odiz6/DXJNwDTHPkaV5IseghzSLYyjmbLR5DUjnfuxKw5zpG+mK3X2PDx1B > +LtUNfBGmnLN3jBa8Q/i2WYxYpAuMZzJcCcocxW0H+yBf8+rZNpIvi/RsTklKkaap > +EOgP9sZXlgJePUbBmdd4Wwx7WTsjna6ckNp/9WE8CuDy6x9Zkc97Rkd+Oxc/KKtF > +1mQ/VdRZj3trlABnHmF0H/H4Qlrt//P/PCl3qRZpE5v34OHDlTT6UjLh5ahWZ3hf > +pj3cSKy9uajnWPFf9tnI0/9cWYbllaCMhIMbDZXRM3F4H03bi2k=3D > +=3DVKCz > -----END PGP MESSAGE----- >=20=20 > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/signed-protected-header.eml b= /test/corpora/protected-headers/signed-protected-header.eml > index c3a21b85..f5efaff0 100644 > --- a/test/corpora/protected-headers/signed-protected-header.eml > +++ b/test/corpora/protected-headers/signed-protected-header.eml > @@ -6,7 +6,7 @@ Message-ID: > MIME-Version: 1.0 > Content-Type: multipart/signed; boundary=3D"=3D-=3D-=3D"; > protocol=3D"application/pgp-signature"; > - micalg=3Dpgp-sha512 > + micalg=3Dpgp-sha256 >=20=20 > --=3D-=3D-=3D > Content-Type: text/plain; protected-headers=3D"v1" > @@ -20,10 +20,9 @@ Content-Type: application/pgp-signature >=20=20 > -----BEGIN PGP SIGNATURE----- >=20=20 > -iLMEAQEKAB0WIQRa6rEfXjPc6HXdt1ttkmEtlORjgQUCWusAfwAKCRBtkmEtlORj > -geIJA/0WcyxlwDfXRMbiGE/crLBYhLpXK6ZMzjEn6HQDntMIk3Kr61rAwL8edKGx > -gbxr1+XlMYRt+PJDhi8iI0odDI1YjiBjjc0bXUoDn60UcjL2MPGshI3426CA7cqB > -cMaoRHajfdxYjSzzfh8duVgi0vmUnsyoePBhANRbDIVmCQS11g=3D=3D > -=3Dc4cq > +iHUEARYIAB0WIQSaOv5sYAZaFI/UtYp+ar6SRkXMYAUCYxiQlwAKCRB+ar6SRkXM > +YIm6AP0UlyfUbhd7bG4Azs0rby3qPUXOC1DtbSpQegSuR7nGgAEAub3WeYgEVVOS > +fsnuNE9Q/LnPTS5m85eMa1s1bS8fcAE=3D > +=3DO+fm > -----END PGP SIGNATURE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/simple-signed-mail.eml b/test= /corpora/protected-headers/simple-signed-mail.eml > index ebf4b786..cd1e9fc3 100644 > --- a/test/corpora/protected-headers/simple-signed-mail.eml > +++ b/test/corpora/protected-headers/simple-signed-mail.eml > @@ -6,7 +6,7 @@ Message-ID: > MIME-Version: 1.0 > Content-Type: multipart/signed; boundary=3D"=3D-=3D-=3D"; > protocol=3D"application/pgp-signature"; > - micalg=3Dpgp-sha512 > + micalg=3Dpgp-sha256 >=20=20 > --=3D-=3D-=3D > Content-Type: text/plain > @@ -19,10 +19,9 @@ Content-Type: application/pgp-signature >=20=20 > -----BEGIN PGP SIGNATURE----- >=20=20 > -iLMEAQEKAB0WIQRa6rEfXjPc6HXdt1ttkmEtlORjgQUCWu718wAKCRBtkmEtlORj > -gUXaA/4/m6CPRgC9JODRKRWo3Szi5D3zg7uf29DIJu9m2vVRw5o0ZeHcxLb26UPe > -qdjPq6GBclkXdeTH9Nv2TW5cToJmMA9UvESeRRzbe6ytvswNEYdSbiYAsv/k9t6K > -KQO2ZSbsbVlkh8xVYC3ORiUS775YrPxVT6QlPkMKAXw3l3Zwcg=3D=3D > -=3DjnDO > +iHUEARYIAB0WIQSaOv5sYAZaFI/UtYp+ar6SRkXMYAUCYxiQYgAKCRB+ar6SRkXM > +YJkmAP9TEGDYF4GZcHaxWDZYf6EKHmNqu1RPYuwEN8QdVbUIxAEA7IiFYPQtKXgr > +wyEYNcJ8aD1CYCGhR8pTA9oT/Vp16Qk=3D > +=3Da+TS > -----END PGP SIGNATURE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/subjectless-protected-header.= eml b/test/corpora/protected-headers/subjectless-protected-header.eml > index 7163b9ae..8c7fb3eb 100644 > --- a/test/corpora/protected-headers/subjectless-protected-header.eml > +++ b/test/corpora/protected-headers/subjectless-protected-header.eml > @@ -17,13 +17,12 @@ Subject: this should not show up as a protected header >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBA/9ZaOuxGtLVWiA7KQfB+4td1AILd1uy039UDb+9YwlhmJTq > -mNqVJu+ZkFniZPMliM0z1QRBkBeL2Q7MrHAdYxYBKrDHKVja4O7jwqeKjy5BzQCW > -fnyT+sb2Mh+dz5P2voF3XJHgqzhFY1rtVEatXSZADwwIVU6oZqGZ8GOELNGSd9KX > -ASNElH7WGZB/TQ5X+MktzOLExx5QWaRK9skogI2RRoOquS7KpMcjzb2FWaJDjr1s > -RGboX7NG3xCvNUV2ByFTvLOeo7eO1GfUsabTUbMMvh3AE1UvHgCu8VJiRrMdmPln > -BM2xnwCYec6wYJ46fHukTgv+286nSQcV0XT6a+qM5GMgV5DMHW2vSyl6kTszJ3EP > -xvQBfPCItA=3D=3D > -=3DGkxz > +hF4DHXHP849rSK8SAQdAxAZy4nBUDdm2u4sgr1inLki0LMCVcsVlax6Pd0AiZAow > +iYz940UtZwQNRRb640w1bB2pAvg5Nn8hJK5ye3qtyUWNW1VEvAa+GXndI/Qt0+7x > +0qIBOXRBCrkOxB10iCvSDVoOMZPj8GgvQwpsnslATJbsp9jV74fU7eFCKE5VWKUw > +FTos+VX1YFZyf2RsznHXdi0CrL2rkUNoLby4SEUa/urd6GKb3xuOjJlIYN4Fh9xz > +e33+Dl3NHohNooytxoJuTNiXbNWe7kidfOwMGzvdYsegk/WMqMLg8DmZPvl0BcYI > +o+4ZU3kuhbk5Pup5nOV6OLrs7A0=3D > +=3DBF8X > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- > diff --git a/test/corpora/protected-headers/wrapped-protected-header.eml = b/test/corpora/protected-headers/wrapped-protected-header.eml > index 9a3c1384..87f3f8da 100644 > --- a/test/corpora/protected-headers/wrapped-protected-header.eml > +++ b/test/corpora/protected-headers/wrapped-protected-header.eml > @@ -20,14 +20,13 @@ Content-Type: application/octet-stream >=20=20 > -----BEGIN PGP MESSAGE----- >=20=20 > -hIwDxE023q1UqxYBA/9ZaOuxGtLVWiA7KQfB+4td1AILd1uy039UDb+9YwlhmJTq > -mNqVJu+ZkFniZPMliM0z1QRBkBeL2Q7MrHAdYxYBKrDHKVja4O7jwqeKjy5BzQCW > -fnyT+sb2Mh+dz5P2voF3XJHgqzhFY1rtVEatXSZADwwIVU6oZqGZ8GOELNGSd9KX > -ASNElH7WGZB/TQ5X+MktzOLExx5QWaRK9skogI2RRoOquS7KpMcjzb2FWaJDjr1s > -RGboX7NG3xCvNUV2ByFTvLOeo7eO1GfUsabTUbMMvh3AE1UvHgCu8VJiRrMdmPln > -BM2xnwCYec6wYJ46fHukTgv+286nSQcV0XT6a+qM5GMgV5DMHW2vSyl6kTszJ3EP > -xvQBfPCItA=3D=3D > -=3DGkxz > +hF4DHXHP849rSK8SAQdAbnAG8Oxige+8PXg1B/Ex8Nc/IcBW7R4Cmnq3rArI3g0w > +rb1P2LngDMpqMxRGAkucBU/omYHuyDyLIoQZc84XYQy9N+M/u4HK187tyXaKx970 > +0qIBnZhdiVm9RFn8CvQLG1hhw8E6UFm/YlURkMoaP66HIU9WLFAlmHrZPOnXJBr5 > +2qOWnqSttuD/1Bjt1R2dguoltYqv1iBkwDlE2mWubSTkDp3Pf3QeJGz3Q727+bHV > +MI3k/5sNfJyyx9lIB3nyjwa/+Ap5orrPBwe+Y8tRdLO9xtvIFO+U9l9L6yPTYPyz > +4P+LVzDS+6tnWxPiLeEz/sRGmtA=3D > +=3DpPju > -----END PGP MESSAGE----- > --=3D-=3D-=3D-- >=20=20 > diff --git a/test/gnupg-secret-key.NOTE b/test/gnupg-secret-key.NOTE > deleted file mode 100644 > index 604496c5..00000000 > --- a/test/gnupg-secret-key.NOTE > +++ /dev/null > @@ -1,9 +0,0 @@ > -How the crypto test gnupg secret was generated: > - > -GNUPGHOME=3Dgnupghome gpg --quick-random --gen-key > -kind: 1 (RSA/RSA) > -size: 1024 > -expire: 0 > -name: Notmuch Test Suite > -email: test_suite@notmuchmail.org > -(no passphrase) > diff --git a/test/gnupg-secret-key.asc b/test/gnupg-secret-key.asc > deleted file mode 100644 > index 6431b56c..00000000 > --- a/test/gnupg-secret-key.asc > +++ /dev/null > @@ -1,34 +0,0 @@ > ------BEGIN PGP PRIVATE KEY BLOCK----- > -Version: GnuPG v1.4.10 (GNU/Linux) > - > -lQHYBE1Mm18BBADlMsMlUeO6usp/XuulgimqlCSphHcYZvH6+Sy7u7W4TpJzid7e > -jEOCrk3UZi2XMPW9+snDMhV9e28HeRz61zAO9G/gedn4N+mKOyTaELEmj9SP2IG2 > -ZTvdUvn30vWIHyfRIww3qEiSzNULKn6zTDfcg6BIY6ZDQ6GFSfH5EioxuQARAQAB > -AAP8CM2/sS9JZWLHZHJrmsU6fygxlaarlxmyhxwLG9WZ+qUJ+xDQqWZkhssrMigP > -7ZQehwLwZ7mvbvfOy/qwTPJMZjQMMuTGEzclwBTOTttSxEDS+kgYmZ05CBjIgXbo > -8+k+L347l+kVRBFsi1cqOkCr+VZQwhOnbeNb8uJsUx27aAECAPD7jsBP73LRgoXQ > -x650D2fzjjuomGVsIxSAPjkDRYmtorsRftaEy7DkvX3Ihu5WN6YRRjJavoL+f8ar > -4escR40CAPN7NOFOGmiFZYzQcfJYQI2m7YDk4B51JxORFvLrvGT+LJnVwhtFsdGS > -QnMyO4eNpKH0qeEkT5Zqha2oyAc0Yd0B/3f962YCmYlbDAvWjcbMvhV7G4DbazVp > -2TNR0BhhEMiOlHuwmTO59s2iukuE5ifaVbwrj+NgpipTsaffKnhALlGjV7Q7Tm90 > -bXVjaCBUZXN0IFN1aXRlIDx0ZXN0X3N1aXRlQG5vdG11Y2htYWlsLm9yZz4gKElO > -U0VDVVJFISmIuAQTAQIAIgUCTUybXwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC > -F4AACgkQbZJhLZTkY4GJFAP9E0mOw+RUGdmqbxSbd2rm0/inUSYOC0Pvt/D05pUY > -xzXDAMZwsy1DWhfS7bSgdD3YTM/22b/LJ2FmbLUF1cU6cNslmdPdfHDZ5+C4qpa1 > -uW11y7djlBFAwxc3NBypT6Bmh/iIixrx413cw8CEU0lSZbSXUvbxZ7Rg4JYm2K6f > -Y7SdAdgETUybXwEEAM74QJJWzPavquSF0IkKDFjEvI44WC1HGNsJF3JVuKv9G00P > -RaHavNNcHEG8MorbfaWk7pipaEJ3+zbPKgp2vRCSJnLL6z813JIQqXJTZzu1ip63 > -s4icfOfXkxFJ5AaFd/pVdi+wjmEwvv+YMtJT9DyXANo6b2eQu+0bMtP4Xuv/ABEB > -AAEAA/wJArUJw450070K6eoXeg22wT0iq/O0aCExSzoI5Kmywytj6KnnAmp9TftL > -WVgrkQntVjrhzPsYoB40JEMrGKd7QL/6LPTNWq3eFW38PSpCiG83T0rtmKCKqHB1 > -Uo0B78AHfYYX7MUOEuCq2AhKTAdZukesoCpmVxcEFtjDEbOB8QIA3cvXrPJN/J2S > -W61mdMT7KlaXZZD8Phs/TY2ZLAiMKUAP1dVYNDvRSDjZLvQrqKQjEAN5jM81cWAV > -pvOIavLhOwIA7uMVIiaQ3vIy10C7ltiLT6YuJL/O6XDnXY/PDuXOatQahd/gmI0q > -dGQLSaHIxYILPZPaW6t0orx+dduQ0ES0DQIA21nEKX0MZpYOY1eIt6OlKemsjL2a > -UTdFhq/OgwVv+QRVHNdYQXmKpKDeW30lN/+BI3zyDTZjtehwKMMxNTu4AJu/iJ8E > -GAECAAkFAk1Mm18CGwwACgkQbZJhLZTkY4H8kgQA4vHsTt8dlJdWJAu2SKZGOPRs > -bIPu5XtRXe3RYbW5H7PqbAnrKIzlIKpkPNTwLL4wVXaF+R/aHa8ZKX3paohrPL74 > -qpbffwtHXyVEwyWlw3m9mgti0de1dy1YvVasCe/UQ8Frc6uNmOwtlQE20k4R4cLI > -SWXT1JrwPoKh9xe++90=3D > -=3DrvTR > ------END PGP PRIVATE KEY BLOCK----- > diff --git a/test/openpgp4-secret-key.asc b/test/openpgp4-secret-key.asc > new file mode 100644 > index 00000000..182a8249 > --- /dev/null > +++ b/test/openpgp4-secret-key.asc > @@ -0,0 +1,15 @@ > +-----BEGIN PGP PRIVATE KEY BLOCK----- > + > +lFgEYxhtlxYJKwYBBAHaRw8BAQdA0PoNKr90DaQV1dIK77wbWm4RT+JQzqBkwIjA > +HQM9RHYAAQDQ5wSfkOGXvKYroALWgibztISzXS5b8boGXykcHERo6w/ctDtOb3Rt > +dWNoIFRlc3QgU3VpdGUgKElOU0VDVVJFISkgPHRlc3Rfc3VpdGVAbm90bXVjaG1h > +aWwub3JnPoiQBBMWCAA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEmjr+ > +bGAGWhSP1LWKfmq+kkZFzGAFAmMYbZwACgkQfmq+kkZFzGDtrwEAjQRn3xhEomah > +wICjQjfi4RKNbvnRViZgosijDBANUAgA/28GrK1tPnQsXWqmuZxQ1Cd5ry4NAnj/ > +4jsxD3cTbnEHnF0EYxhtlxIKKwYBBAGXVQEFAQEHQEOd3EyCD5qo4+QuHz0lruCG > +VM6n6RI4dtAh3cX9uHwiAwEIBwAA/1oe+p5jNjNE5lEj4yTpYjCxCeC98MolbiAy > +0yY7526wECqIeAQYFggAIBYhBJo6/mxgBloUj9S1in5qvpJGRcxgBQJjGG2XAhsM > +AAoJEH5qvpJGRcxgBdsA/R9ZECoxai5QhOitDIAUZVCRr59Pm1VMPiJOOIla2N1p > +AQCNESwJ9IJOdO/06q+bR2GG4WyEkB4VoVBiA3hFx/zZAA=3D=3D > +=3DuGTo > +-----END PGP PRIVATE KEY BLOCK----- > diff --git a/test/openpgp4-secret-key.asc.NOTE b/test/openpgp4-secret-key= .asc.NOTE > new file mode 100644 > index 00000000..4693768e > --- /dev/null > +++ b/test/openpgp4-secret-key.asc.NOTE > @@ -0,0 +1,5 @@ > +The OpenPGPv4 secret key for the crypto tests was generated using: > + > +$ gpg --quick-generate-key \ > + 'Notmuch Test Suite (INSECURE!) ' \ > + future-default default never > diff --git a/test/test-lib.sh b/test/test-lib.sh > index d664812f..eec5c5b4 100644 > --- a/test/test-lib.sh > +++ b/test/test-lib.sh > @@ -71,7 +71,7 @@ add_gnupg_home () { > _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; } > at_exit_function _gnupg_exit > mkdir -p -m 0700 "$GNUPGHOME" > - gpg --no-tty --import <$NOTMUCH_SRCDIR/test/gnupg-secret-key.asc >"$= GNUPGHOME"/import.log 2>&1 > + gpg --no-tty --import <$NOTMUCH_SRCDIR/test/openpgp4-secret-key.asc = >"$GNUPGHOME"/import.log 2>&1 > test_debug "cat $GNUPGHOME/import.log" > if (gpg --quick-random --version >/dev/null 2>&1) ; then > echo quick-random >> "$GNUPGHOME"/gpg.conf > @@ -81,8 +81,8 @@ add_gnupg_home () { > echo no-emit-version >> "$GNUPGHOME"/gpg.conf >=20=20 > # Change this if we ship a new test key > - FINGERPRINT=3D"5AEAB11F5E33DCE875DDB75B6D92612D94E46381" > - SELF_USERID=3D"Notmuch Test Suite (INSE= CURE!)" > + FINGERPRINT=3D"9A3AFE6C60065A148FD4B58A7E6ABE924645CC60" > + SELF_USERID=3D"Notmuch Test Suite (INSECURE!) " > SELF_EMAIL=3D"test_suite@notmuchmail.org" > printf '%s:6:\n' "$FINGERPRINT" | gpg --quiet --batch --no-tty --imp= ort-ownertrust > } > --=20 > 2.30.2 > > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQQttUkcnfDcj0MoY88+nXFzcd5WXAUCYx4WXgAKCRA+nXFzcd5W XG6kAQDRKujQwr+9i9gofKqyBq/LFc3nw7bEG0TnknviJhXdVAEAlNObvJsmiG/C FeD8EyZCkH8HUR0y5xgSBVu2Q8WP/AA= =uXZ/ -----END PGP SIGNATURE----- --=-=-=-- --===============1176327684774146376== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --===============1176327684774146376==--