From 6781aefdb50958ff34a79eb9c58c0aa62e092d2b Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Wed, 31 Oct 2018 12:19:54 +0100
Subject: [PATCH] update test keys and mails
---
enzevalos_iphone.xcodeproj/project.pbxproj | 60 +++++---
.../testKeys/alicePublic.asc | 58 ++++++++
enzevalos_iphoneTests/testKeys/bobSecret.asc | 137 ++++++++++++++++++
.../testMails/enc+signThunderbird.eml | 125 ----------------
.../testMails/enc+signedInlineThunderbird.eml | 96 ++++++------
...nderbird.eml => encIinlineThunderbird.eml} | 66 ++++-----
.../testMails/encThunderbird.eml | 88 +++++------
.../testMails/signedInlineThunderbird.eml | 29 ++--
...nThunderbird.eml => signedThunderbird.eml} | 46 +++---
9 files changed, 393 insertions(+), 312 deletions(-)
create mode 100644 enzevalos_iphoneTests/testKeys/alicePublic.asc
create mode 100644 enzevalos_iphoneTests/testKeys/bobSecret.asc
delete mode 100644 enzevalos_iphoneTests/testMails/enc+signThunderbird.eml
rename enzevalos_iphoneTests/testMails/{encInlineThunderbird.eml => encIinlineThunderbird.eml} (62%)
rename enzevalos_iphoneTests/testMails/{signThunderbird.eml => signedThunderbird.eml} (79%)
diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 62251fb6..db04c1fd 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -108,13 +108,14 @@
3EC35F2E200376A1008BDF95 /* SendViewController+Invitation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC35F2C200376A1008BDF95 /* SendViewController+Invitation.swift */; };
3EC35F302003838E008BDF95 /* InvitationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC35F2F2003838E008BDF95 /* InvitationTests.swift */; };
45262931B4C72A96C686C533 /* Pods_enzevalos_iphoneTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9B9CE43043CF806E1C02FCA /* Pods_enzevalos_iphoneTests.framework */; };
- 470709192189BC3500DF71A3 /* enc+signedInlineThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709122189BC3400DF71A3 /* enc+signedInlineThunderbird.eml */; };
- 4707091A2189BC3500DF71A3 /* enc+signThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709132189BC3500DF71A3 /* enc+signThunderbird.eml */; };
- 4707091B2189BC3500DF71A3 /* signThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709142189BC3500DF71A3 /* signThunderbird.eml */; };
- 4707091C2189BC3500DF71A3 /* signedInlineThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709152189BC3500DF71A3 /* signedInlineThunderbird.eml */; };
- 4707091D2189BC3500DF71A3 /* encInlineThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709162189BC3500DF71A3 /* encInlineThunderbird.eml */; };
4707091E2189BC3500DF71A3 /* plainThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709172189BC3500DF71A3 /* plainThunderbird.eml */; };
- 4707091F2189BC3500DF71A3 /* encThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709182189BC3500DF71A3 /* encThunderbird.eml */; };
+ 470709262189C73900DF71A3 /* enc+signedInlineThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709212189C73900DF71A3 /* enc+signedInlineThunderbird.eml */; };
+ 470709272189C73900DF71A3 /* encThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709222189C73900DF71A3 /* encThunderbird.eml */; };
+ 470709282189C73900DF71A3 /* encIinlineThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709232189C73900DF71A3 /* encIinlineThunderbird.eml */; };
+ 470709292189C73900DF71A3 /* signedInlineThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709242189C73900DF71A3 /* signedInlineThunderbird.eml */; };
+ 4707092A2189C73900DF71A3 /* signedThunderbird.eml in Resources */ = {isa = PBXBuildFile; fileRef = 470709252189C73900DF71A3 /* signedThunderbird.eml */; };
+ 4707092D2189C74200DF71A3 /* bobSecret.asc in Resources */ = {isa = PBXBuildFile; fileRef = 4707092B2189C74200DF71A3 /* bobSecret.asc */; };
+ 4707092E2189C74200DF71A3 /* alicePublic.asc in Resources */ = {isa = PBXBuildFile; fileRef = 4707092C2189C74200DF71A3 /* alicePublic.asc */; };
4707096D1F8F9F4900657F41 /* ExportViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4707096C1F8F9F4900657F41 /* ExportViewController.swift */; };
4715F637202A0248001BFFD0 /* CoreDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4715F636202A0248001BFFD0 /* CoreDataTests.swift */; };
472276BC1FCD46B200ADA507 /* LoggingEventType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A18E7D761FBDE5D9002F7CC9 /* LoggingEventType.swift */; };
@@ -300,13 +301,14 @@
3EC35F2C200376A1008BDF95 /* SendViewController+Invitation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SendViewController+Invitation.swift"; sourceTree = "<group>"; };
3EC35F2F2003838E008BDF95 /* InvitationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitationTests.swift; sourceTree = "<group>"; };
411EB2B85F99B48FFD36F966 /* Pods-enzevalos_iphoneTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-enzevalos_iphoneTests.debug.xcconfig"; path = "../workspace/Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.debug.xcconfig"; sourceTree = "<group>"; };
- 470709122189BC3400DF71A3 /* enc+signedInlineThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "enc+signedInlineThunderbird.eml"; sourceTree = "<group>"; };
- 470709132189BC3500DF71A3 /* enc+signThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "enc+signThunderbird.eml"; sourceTree = "<group>"; };
- 470709142189BC3500DF71A3 /* signThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = signThunderbird.eml; sourceTree = "<group>"; };
- 470709152189BC3500DF71A3 /* signedInlineThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = signedInlineThunderbird.eml; sourceTree = "<group>"; };
- 470709162189BC3500DF71A3 /* encInlineThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = encInlineThunderbird.eml; sourceTree = "<group>"; };
470709172189BC3500DF71A3 /* plainThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = plainThunderbird.eml; sourceTree = "<group>"; };
- 470709182189BC3500DF71A3 /* encThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = encThunderbird.eml; sourceTree = "<group>"; };
+ 470709212189C73900DF71A3 /* enc+signedInlineThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "enc+signedInlineThunderbird.eml"; sourceTree = "<group>"; };
+ 470709222189C73900DF71A3 /* encThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = encThunderbird.eml; sourceTree = "<group>"; };
+ 470709232189C73900DF71A3 /* encIinlineThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = encIinlineThunderbird.eml; sourceTree = "<group>"; };
+ 470709242189C73900DF71A3 /* signedInlineThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = signedInlineThunderbird.eml; sourceTree = "<group>"; };
+ 470709252189C73900DF71A3 /* signedThunderbird.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = signedThunderbird.eml; sourceTree = "<group>"; };
+ 4707092B2189C74200DF71A3 /* bobSecret.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bobSecret.asc; sourceTree = "<group>"; };
+ 4707092C2189C74200DF71A3 /* alicePublic.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = alicePublic.asc; sourceTree = "<group>"; };
4707096C1F8F9F4900657F41 /* ExportViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExportViewController.swift; sourceTree = "<group>"; };
4715F636202A0248001BFFD0 /* CoreDataTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreDataTests.swift; sourceTree = "<group>"; };
472F396D1E14F384009260FB /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
@@ -564,17 +566,25 @@
470709112189BB4A00DF71A3 /* testMails */ = {
isa = PBXGroup;
children = (
- 470709122189BC3400DF71A3 /* enc+signedInlineThunderbird.eml */,
- 470709132189BC3500DF71A3 /* enc+signThunderbird.eml */,
- 470709162189BC3500DF71A3 /* encInlineThunderbird.eml */,
- 470709182189BC3500DF71A3 /* encThunderbird.eml */,
+ 470709212189C73900DF71A3 /* enc+signedInlineThunderbird.eml */,
+ 470709232189C73900DF71A3 /* encIinlineThunderbird.eml */,
+ 470709222189C73900DF71A3 /* encThunderbird.eml */,
+ 470709242189C73900DF71A3 /* signedInlineThunderbird.eml */,
+ 470709252189C73900DF71A3 /* signedThunderbird.eml */,
470709172189BC3500DF71A3 /* plainThunderbird.eml */,
- 470709152189BC3500DF71A3 /* signedInlineThunderbird.eml */,
- 470709142189BC3500DF71A3 /* signThunderbird.eml */,
);
path = testMails;
sourceTree = "<group>";
};
+ 470709202189C24800DF71A3 /* testKeys */ = {
+ isa = PBXGroup;
+ children = (
+ 4707092C2189C74200DF71A3 /* alicePublic.asc */,
+ 4707092B2189C74200DF71A3 /* bobSecret.asc */,
+ );
+ path = testKeys;
+ sourceTree = "<group>";
+ };
472F39921E279792009260FB /* protocols */ = {
isa = PBXGroup;
children = (
@@ -782,6 +792,7 @@
A135268F1D955BE000D3BFE1 /* enzevalos_iphoneTests */ = {
isa = PBXGroup;
children = (
+ 470709202189C24800DF71A3 /* testKeys */,
470709112189BB4A00DF71A3 /* testMails */,
4715F636202A0248001BFFD0 /* CoreDataTests.swift */,
476801E221898BBE00F7F259 /* MailTest.swift */,
@@ -1151,15 +1162,16 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 4707091A2189BC3500DF71A3 /* enc+signThunderbird.eml in Resources */,
- 4707091C2189BC3500DF71A3 /* signedInlineThunderbird.eml in Resources */,
- 4707091B2189BC3500DF71A3 /* signThunderbird.eml in Resources */,
+ 470709262189C73900DF71A3 /* enc+signedInlineThunderbird.eml in Resources */,
479B597B20691C1A00B3944D /* ObjectivePGP.framework in Resources */,
+ 470709282189C73900DF71A3 /* encIinlineThunderbird.eml in Resources */,
+ 470709292189C73900DF71A3 /* signedInlineThunderbird.eml in Resources */,
8428A8841F436ACC007649A5 /* GamificationElements.xcassets in Resources */,
- 4707091D2189BC3500DF71A3 /* encInlineThunderbird.eml in Resources */,
- 470709192189BC3500DF71A3 /* enc+signedInlineThunderbird.eml in Resources */,
- 4707091F2189BC3500DF71A3 /* encThunderbird.eml in Resources */,
+ 4707092D2189C74200DF71A3 /* bobSecret.asc in Resources */,
4707091E2189BC3500DF71A3 /* plainThunderbird.eml in Resources */,
+ 4707092E2189C74200DF71A3 /* alicePublic.asc in Resources */,
+ 4707092A2189C73900DF71A3 /* signedThunderbird.eml in Resources */,
+ 470709272189C73900DF71A3 /* encThunderbird.eml in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/enzevalos_iphoneTests/testKeys/alicePublic.asc b/enzevalos_iphoneTests/testKeys/alicePublic.asc
new file mode 100644
index 00000000..73f94309
--- /dev/null
+++ b/enzevalos_iphoneTests/testKeys/alicePublic.asc
@@ -0,0 +1,58 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+gXhCQhUXVfrkXAAQg+jrg04=
+=XzWc
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/enzevalos_iphoneTests/testKeys/bobSecret.asc b/enzevalos_iphoneTests/testKeys/bobSecret.asc
new file mode 100644
index 00000000..4567fd75
--- /dev/null
+++ b/enzevalos_iphoneTests/testKeys/bobSecret.asc
@@ -0,0 +1,137 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+5hFcICXdNEGGg2WP7gSbZtF7RiNVzQ==
+=XRxp
+-----END PGP PRIVATE KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=WHyX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/enzevalos_iphoneTests/testMails/enc+signThunderbird.eml b/enzevalos_iphoneTests/testMails/enc+signThunderbird.eml
deleted file mode 100644
index 7672166a..00000000
--- a/enzevalos_iphoneTests/testMails/enc+signThunderbird.eml
+++ /dev/null
@@ -1,125 +0,0 @@
-Return-Path: <alice@enzevalos.de>
-Delivered-To: bob@enzevalos.de
-To: Bob <bob@enzevalos.de>
-From: alice <alice@enzevalos.de>
-Subject: enc + sign mail from thunderbird
-Openpgp: preference=signencrypt
-Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
- 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
- FRdV+uRcABCD6OuDTg==
-Message-ID: <d42a5c0d-da6d-06b0-3978-3a356ecc7770@enzevalos.de>
-Date: Wed, 31 Oct 2018 11:25:04 +0100
-User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
- Gecko/20100101 Thunderbird/52.9.1
-MIME-Version: 1.0
-Content-Type: multipart/encrypted;
- protocol="application/pgp-encrypted";
- boundary="y1OD3uiel822Auu59tScFTWdXTJX4i5WG"
-
-This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---y1OD3uiel822Auu59tScFTWdXTJX4i5WG
-Content-Type: application/pgp-encrypted
-Content-Description: PGP/MIME version identification
-
-Version: 1
-
---y1OD3uiel822Auu59tScFTWdXTJX4i5WG
-Content-Type: application/octet-stream; name="encrypted.asc"
-Content-Description: OpenPGP encrypted message
-Content-Disposition: inline; filename="encrypted.asc"
-
------BEGIN PGP MESSAGE-----
-
-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
-qC+NqprYy80H
-=3lQ3
------END PGP MESSAGE-----
-
---y1OD3uiel822Auu59tScFTWdXTJX4i5WG--
diff --git a/enzevalos_iphoneTests/testMails/enc+signedInlineThunderbird.eml b/enzevalos_iphoneTests/testMails/enc+signedInlineThunderbird.eml
index 1345992d..c23ba71e 100644
--- a/enzevalos_iphoneTests/testMails/enc+signedInlineThunderbird.eml
+++ b/enzevalos_iphoneTests/testMails/enc+signedInlineThunderbird.eml
@@ -2,7 +2,7 @@ Return-Path: <alice@enzevalos.de>
Delivered-To: bob@enzevalos.de
To: Bob <bob@enzevalos.de>
From: alice <alice@enzevalos.de>
-Subject: enc + signed mail with inline pgp from thunderbird
+Subject: enc+signed with inline from Thunderbird
Openpgp: preference=signencrypt
Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
xsDNBFp+5vsBDACuHCvqCBlUT1O+IIQ0LOWsA2l/UAa+7PHNHotZJ22BtR//fmkdrIesPye2
@@ -45,8 +45,8 @@ Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
PUGqnJ3Q4N73NoT8RNFru90P0HAgYPOMEphFh1T36OPCg7zIYuR1+eFu4mzpNirOU1MAYeVQ
cw1lQm55YnkGHnrDrikMLOk2ZqmWGw+8k96Xvsx7TrnrnPSa4uf/DbBo6Sd0xordGbSBeEJC
FRdV+uRcABCD6OuDTg==
-Message-ID: <5e0b41c9-66ed-d952-d0aa-f28ff55c258d@enzevalos.de>
-Date: Wed, 31 Oct 2018 11:27:02 +0100
+Message-ID: <25ea9a1e-f826-41dc-91e8-03f74cbad172@enzevalos.de>
+Date: Wed, 31 Oct 2018 12:17:03 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
Gecko/20100101 Thunderbird/52.9.1
MIME-Version: 1.0
@@ -58,51 +58,51 @@ Content-Language: en-US
-----BEGIN PGP MESSAGE-----
Charset: utf-8
-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
-LJBFa17tTRbY2wDGZ+jNpRle
-=3D+aej
+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
+wSNJHK1fOFdnxcYTWCYvdI8=3D
+=3D4+ip
-----END PGP MESSAGE-----
diff --git a/enzevalos_iphoneTests/testMails/encInlineThunderbird.eml b/enzevalos_iphoneTests/testMails/encIinlineThunderbird.eml
similarity index 62%
rename from enzevalos_iphoneTests/testMails/encInlineThunderbird.eml
rename to enzevalos_iphoneTests/testMails/encIinlineThunderbird.eml
index 1d73d45e..efd67fe5 100644
--- a/enzevalos_iphoneTests/testMails/encInlineThunderbird.eml
+++ b/enzevalos_iphoneTests/testMails/encIinlineThunderbird.eml
@@ -2,7 +2,7 @@ Return-Path: <alice@enzevalos.de>
Delivered-To: bob@enzevalos.de
To: Bob <bob@enzevalos.de>
From: alice <alice@enzevalos.de>
-Subject: enc mail with inline pgp from thunderbird
+Subject: enc with inline from Thunderbird
Openpgp: preference=signencrypt
Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
xsDNBFp+5vsBDACuHCvqCBlUT1O+IIQ0LOWsA2l/UAa+7PHNHotZJ22BtR//fmkdrIesPye2
@@ -45,8 +45,8 @@ Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
PUGqnJ3Q4N73NoT8RNFru90P0HAgYPOMEphFh1T36OPCg7zIYuR1+eFu4mzpNirOU1MAYeVQ
cw1lQm55YnkGHnrDrikMLOk2ZqmWGw+8k96Xvsx7TrnrnPSa4uf/DbBo6Sd0xordGbSBeEJC
FRdV+uRcABCD6OuDTg==
-Message-ID: <57fe0db6-aaa4-45e7-0f1b-79714851a510@enzevalos.de>
-Date: Wed, 31 Oct 2018 11:26:12 +0100
+Message-ID: <b61496b6-f4e5-74d0-dc38-07e168075640@enzevalos.de>
+Date: Wed, 31 Oct 2018 12:16:15 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
Gecko/20100101 Thunderbird/52.9.1
MIME-Version: 1.0
@@ -58,36 +58,36 @@ Content-Language: en-US
-----BEGIN PGP MESSAGE-----
Charset: utf-8
-hQGMA8KB2AWxAHMfAQv/cRChTHhvz7xn9FsJ1r9ZYOwTFUhhwhmoheIYaLPdGpwU
-Qi15eberyvgEAKgl9TEraqae8n4bF2xiJms5VcDVAOU+SnY3yi+kDyfPNkY25Jwp
-KBbRT2+0ekJYpznKvi54r8xooxN3sFo9vEXSt3ZIvPGGmtd3X98dS04OlhxbrVSQ
-JGtPTMNTRTnpDYk6sp/rw4pYLCOZAGWS3MI4nxxV4Y1y2MNU8JgvqPFfrlVMv3Ox
-D//ajGmQxfAl/pwPnJYWSHtt8tPDGUgoFQS37KbasseWj0KDTzqPUJYsht813YKH
-AFnXbEWJfyGPM8IUXXS0WStaFTIEq7c3tX2nrF1hKboieKuUYhMW85GsAEJUYsM7
-m6ZuOsMufbCnOc4700YDuKWGvbymHbFtwiJ6CIJFKqeuZfMSRakyGRc6uUOvs6m8
-Zl7S3ZhX8C35FSUUMgqNP4VTH7nYJChRpJn4DDG0gmL1DzGXddiOeyp/AzRComw/
-FRyYpSw1vErqHvOWpVsVhQGMA6mH5Wf4h8YiAQv/etrUsqGwOWt/AE2UHMWOkL6C
-9TNI7C/KR+1fNqVHk/jgJy3FAWUd83KJ9Oy/ph+mJWs8AsDlYTQVLG6bQDJTxotU
-0iYTjc+kXX6KwkaGx13R62NKNiOAZenLPaS6IWxSadVMQ73mTWqXKvy5zg8p4oXf
-yofQ55CIi7tQH6ByMGFwT8AITOaK3QzHcO/Ijx8DBdUhvha0jMqeYjjuhcAZvk1o
-BWWAigU/iBwGGHm6/G1JZ8e+/uOaEPZSIiEMIYrbt3Onr3AMRA3/4R7a3MVeApSt
-fDP5ZY8h87GttzK7fJpiCbcbj3MjAr9CkKqkbfo4e6srxnx+3pNkVJwm9PIy+ZmX
-TJV8kLiQTLiHttzKGT+rGNAHRjpSNa5yzqZoUj6+HnWF6s9D6quzvWmVVLr3VNZD
-c1BHrn/AKqk9DFIGGROio4daOoWUNwfId16L30QUGryf9GAI9dRL5J/WlS/dHIR7
-TbNOJJY4uZ/ouDX7lZY+GXU2xsh4YnUBBggQuMZv0ukB/mdJ9O3hX11S1UkrMu2U
-+RSh/qIvG/uPjgpI4YJ6Ft7yVXtxJaQrWVTymhHynxe2rvIGoZomdeyV5KQtS+P+
-XsBtoRCJFl56eKzWb1JrHdwyH+DBukug49ebAUKl1oWig6gTriPMjDF2TMZ3yamx
-RZYTcIjL3TZbtkj0fZEVUOSvVhkHRZRbmJMbhYd3IZJkVuHhIbvs2gcwwV6fEfvY
-xR9xNh7s1zkyAJRnMIvectpcZnPbQr/uYIfvkcpIguDD2ZzfqBiOTUcdRfTYLvPj
-sFvnbdtT769fqjIlfME3nGCKOUOY7psTyu3MZdb0Cm/PMXIzwvhCFQqzJblW+mgn
-ilEykfYV3mRs3GkjKDz7f437zQreF4kUixP0e9+jHN3EGf1OeGdAmBR8GeC2NIb9
-w57/xqyPVNAlE/R0bKBfCZ34HorrAJN3PcJ0bUdPSHH5qhQp4Rj+br5U9u1LZ+kJ
-FIeBCE14TaRAOEbew3tToFFoJXN2kmNXS2zAUtPAHtcVqXewOXjN+MNX1FabGaVy
-hc20qDgSQ4txeHjCB1oEK4RPt01yPLmrcvV9U5yNUsZhP+nOdlxsTAJQ95i+fBVq
-D2vyKm2zXOKZ3R+/6pEdqrnJFo/EkEarwcN6zDkRVteztWO93py7FWnlqfUjOZbX
-EG6R92QWfCXRdjX8Hkq0CUHNbLB4Mgzb88fmdZcCsydbcsMALQmOJaA2srrOCl8S
-Vce0Ch+EAwXcVyqSNRrD0mi9WyVeTsIyEzQ1FFsUzWoHsw=3D=3D
-=3Dutlx
+hQGMA26fFf9Ygp7zAQwAljI+Vx1FyBb7R2TdQEY/dwQYy4cDHCeJ170KrFJHBhV/
+zkZe/NF7RBk0mmNkPHem3kbrHa66hVkl3m6Zo9KTWrAGO8WD6jrcYLcXA+ll99+z
+siXzOU0vmGsQf7NZV9aooejVkXm96YSTzS58805znOSHsepyHY2MzwWUUhRyZ7x1
+58xswnoejBAGSmk8yHgSm58mfBTMfVlC1ICsBguqaaxc43Xq946uEJeEKjYYyhAH
+qSlDfU86AOmdjoGeaRcikdCGnaIK0FniS4EZkGb39A/4U/gIEsOT59bk2hfEGELX
+e2jakX6dsRmimXp2Fhxnxt74k1WfnMJl04yR4j+ONJ7l4kDn0S1KmUTWnikpL0jk
+L6VkwrAj/QafDcXdNSSrN5xC5Wou/mW8CAxJuWtfBNauWXx8tGVOWjCls6TXweIh
+QnZP7eBOzZir0i+pzYHGkpSrsqCLD6k2c3ZSnwlN4o1Bl4R+9Bp0nLU0J/MWHOkR
+eeLDJV4R7rLwa4yafYEphQGMA6mH5Wf4h8YiAQwAjXBRu5LT2iyvA0WPjblDDf0t
+rNW1LK92AdE4AsrlQ0a6Co/lFIZTCF8C85CGh1dRK8URNrp/CmzAexGNzi2VyzkR
+dCHlmr+3Il0Y05B/uPpAJjXwsH0TgvIU394IEZg6eVEQOMBgFhxmgogOSMgqVIAs
+RJ7+LcURLjeJTsAr1KtsaqEXSaqH7NaYPO/MiVcahEKYgsRBtqvMyzCj4OZbYXkF
+nYTpdNRhZNC0Jl9r9pebLtTbVCQJdWgSI4muKnyJomiiyKxVZNFlEUb06d5L8pc6
+kD+OO0ckbS7jdGDoarg6D4WNR8g5/AGxemLkJKpGYBzQ0UrbcZ778dXL2Hn6ZMaF
+QA2Hk0wKbaXhxdr418YiIYam1B3LyqP9PH/xptZVcDkwpe6rIPj6vITSDwAYYHD+
+H0IrGTU3GTqLR/O4b/jSC59N9zYyfSoTW+C+QNmBlgSbC1GzxcrBgXXxO7TA5xIs
+ZZ3hEid8wJOlqoHV48nxUecpYUmrGWIekjzF25H40ukB0QSl480vNF+qzk4KZrfe
+wEq2maaKR6D+3aN7L4AVIJ/HJx6GOIUIS8nmfPr6iVL1JnBRS/J/A13DuIHGZcTA
+tW4w7PbyotPbtcEpR+gQaIYg2prCeSqjlvpHCuAK30F082b42X2y/Mh4lDlOGgZI
+9pS2f0zxBXOm+7Vvz006fCNlQAMkBFWT0YAqQMs6smss0PN80c2vFbYtQVlfFqb2
+vNPcf8sDTYclukFptMMSDESxea2rp+i+PyAPWW2dyipmd6KajiWx6zPNXYMB4em2
+/ZjdjCmhiZ3fsGQCDMRNyUVRC028S7okRpdb5yIwYUvlC8CmLtSPygYsiLe+j8OD
+pGKIpiwFav47pu2gCRF0LCMjpIJmLTJoemhKL+EUyKVLt2E8SNJ80fZPK2x7KyV/
+VMQ8Adkvqz9pulpcmOz9WloMJz287Yg1Ptud5ANng/1zV/caSuR5zSYKxe5XJ1Qx
+toIqrnO2w2qUh4G9bBP+0RyAcV3sbO4G0fTxkfwtRWx6x9zBxDSDaPViR5PYgGnM
+Jgff31KYMi+kTRgOzcUCp1kcaZrRoJ/bxznhEV3FaADqmlnGGfA2LVKEY+dy+wEk
+UQELoDg+Cfpv1jVq7Ghcaf5/JI02YuwP/HDl4xgtkRmmgBV5o6YLzts6rb4lyk7r
+1qJcgTbRVJSDeLSkIZzU405NZdY7ZOmbioaqMHsvDXYw1E09mmcOET62knE57J1f
+auXDgLhzEVxLfHcU4hvb0QMC9+tMQEpTWU3o7YSmoyoPFyro8sEICZgW+ELmg1o=3D
+=3DZZML
-----END PGP MESSAGE-----
diff --git a/enzevalos_iphoneTests/testMails/encThunderbird.eml b/enzevalos_iphoneTests/testMails/encThunderbird.eml
index 8b683b8f..2d738a82 100644
--- a/enzevalos_iphoneTests/testMails/encThunderbird.eml
+++ b/enzevalos_iphoneTests/testMails/encThunderbird.eml
@@ -2,7 +2,7 @@ Return-Path: <alice@enzevalos.de>
Delivered-To: bob@enzevalos.de
To: Bob <bob@enzevalos.de>
From: alice <alice@enzevalos.de>
-Subject: enc mail from Thunderbird
+Subject: enc from Thunderbird
Openpgp: preference=signencrypt
Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
xsDNBFp+5vsBDACuHCvqCBlUT1O+IIQ0LOWsA2l/UAa+7PHNHotZJ22BtR//fmkdrIesPye2
@@ -45,66 +45,66 @@ Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
PUGqnJ3Q4N73NoT8RNFru90P0HAgYPOMEphFh1T36OPCg7zIYuR1+eFu4mzpNirOU1MAYeVQ
cw1lQm55YnkGHnrDrikMLOk2ZqmWGw+8k96Xvsx7TrnrnPSa4uf/DbBo6Sd0xordGbSBeEJC
FRdV+uRcABCD6OuDTg==
-Message-ID: <ae9db0f8-498a-0e6b-fbe7-c534a8226eaa@enzevalos.de>
-Date: Wed, 31 Oct 2018 11:24:30 +0100
+Message-ID: <f11c49b1-f2e6-a981-2ed2-92e3ea8af251@enzevalos.de>
+Date: Wed, 31 Oct 2018 12:15:40 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
Gecko/20100101 Thunderbird/52.9.1
MIME-Version: 1.0
Content-Type: multipart/encrypted;
protocol="application/pgp-encrypted";
- boundary="YHMt6qox5Q98ST4AQG72PmRsHN3WX9OVK"
+ boundary="rQTpXP7Mot8JXwKx13GEOPUvkBQfoDvqM"
This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156)
---YHMt6qox5Q98ST4AQG72PmRsHN3WX9OVK
+--rQTpXP7Mot8JXwKx13GEOPUvkBQfoDvqM
Content-Type: application/pgp-encrypted
Content-Description: PGP/MIME version identification
Version: 1
---YHMt6qox5Q98ST4AQG72PmRsHN3WX9OVK
+--rQTpXP7Mot8JXwKx13GEOPUvkBQfoDvqM
Content-Type: application/octet-stream; name="encrypted.asc"
Content-Description: OpenPGP encrypted message
Content-Disposition: inline; filename="encrypted.asc"
-----BEGIN PGP MESSAGE-----
-hQGMA8KB2AWxAHMfAQv+KyWPknmBLEdWnGtQBlrWJjWiNgEoevOg8T/4D+cSON4w
-dUY5FAxyBVneRRZ1pK+OvrLbKNXmmiA9sul/zc0HfaKpHhlpJPibcJ5rbpXjQGNe
-LwJOwUNySIlxrtjmWEZ81zKJDFEs1DKJZ+Ou7j7fm3QAr5fNDSphmvY5SMoQ/LKI
-YsyoE9N2LIVZF++j0ysFT5o0KtVgWJwtoQgyM/iP5/mWfpi5sGcMBqj/1fz1jpHQ
-7QRKI6DQOM32Xi2CZRNL+3AvLZKWBghTy96bK4mv94M+5t4yYSt8EP+xi88suluQ
-j7cmI36PrjCOBAIvpgkBzsOzxOaIIsvZ/uugUFrJZwkBLIQJVETDfo4l6i47hCT0
-WdmBG89jRNxkJhUi4DUgWr7HezajhsAr8rMcX5LcoTT7/CcyhXWFNXmwxSHOnwyH
-FNVilB0TjJXKq/eITsAYl2mOE5mO7TTW6VkjF4FVdA5aj9fySIl5V9fju3QXBqwq
-HMSoN/IFbwCuTMlctC1yhQGMA6mH5Wf4h8YiAQv/fBgiU4h+f+dSlzgKmPV4/XuT
-j4YYgH4B1W4MreZ3DYBdRslI8O8S4VjmF8TV3wpkNnPijEyHBVynLowGPeQBSlxn
-wfQxKXzUB6MzJ7CtBWQfHm+EHCq2u5iUPPsg3JOFKKyGEYrecGngvNTssco8Mn6S
-ivEZomOGEUFcyFB7ROOwKIcgJsVOj1XQnY8xxJ/1ZshTBmIqKoA+cgqwkMg4f27a
-1jxwKhFwJOGJFEMi+mUx5lsHeKUqX1rQtGemqQKvh0Ne4qY7pnFQWBkxbtXAjlX2
-hxOEg5xQbeEvshv6xzzF/HhOnwQGses1JeW2O5A6E+h6UEkIwcHvXD9utfX0cBqN
-7C6vRBxI0GmEq2lnpNJ6P1P0QqI0OAeI4bbZWFGjEdyNmvH3hZ8t76fdSUpPTEOj
-CurB6ggp7k18+qDrUHGAgd2RAcV5y2g8gK/ehTui+lxAFTqo8gaR9blkshiMUp2l
-fS71yz4CEKk/4cyjPkljjrUL2VZiaZJy5Ij4CylT0ukBoswwZt1bbatzNFPeplCj
-z2m8fR10KjfRN+qinZbwz5BvRPai4GeyTN7w2D0wS94h0+FTxkr+g3odefha0xbG
-+XDCEocy26gor0bzUUzaR268JeoahU6chfJaGXg7jkF7DLfLlofQDfEYI6nq6YiC
-MyfX6tkaaCepFgJozLW3wHdc6Pdanb5gv2s/wtFP1orVI2CoSRtNBVvlY1lFZc0H
-WQa8Uur5bjZSuPCA3BLquGI3TR3sg8k6x85e/74GIXGesundjKNP8ZBH7YR0FxTb
-v+GdTgtUeJtc6TKQQOQGNxQORoKcMiJo1zWPelrKuXkD8BwzF2YuPqM75TRyIev2
-HxfkXx1n35bsoQf72XKI6t08g4mf98BikvG1wQO+QU78vaA6qt1Ud5WzvsDhbPNQ
-uI7Rf78SKYNIb2h26h3l87d+lL2bJTppUeZ1FpWeDIsmmXVxtp7pEZWdjyZvhYH0
-nhBR+7fQskECINeCyUqG8iRGZDQ0odrtFPnHTdz/JmmbyYtWPj9ZDcKnlTaiw/CY
-wB2eyJ7eQ/XpQebdvMM3QIXCK/7Kb8nOocrwtYbEyH0ZiLrZIP7rO7qU2enD+ztO
-7fG4MxXWR1edJPPr0ARnBAwnD2vNMMBhk4SRsIkF6pWugLdoUPfMLC1K+i9X1Z9K
-fbgydmVmBAV1lgK2VhRG18DLIl5Tix1QDLf8Z7RnHunj/LiyUllIYXGcebLyyxpM
-xiePvEp5LLBMR4yirdR929169L6bX9qJHKT89ZBBLx9+hW8t+oL7HZ+nqoKLjTSQ
-YHnD+48DehNhlHS9iNhO3XNuXba3jlFyWV0UghIQQvZTnoheyutxfPcC6e3l4Heg
-Ed9qA5WoqvwtVJENeMFUyVa5eM7TeR93mc3insFGI+i8E7+VTdXLVgTqJqd1s90/
-GCbuoyz6b4IzJ9GHpFeRPO6WbZQt9GIqr/lfBjv/lf7dKA2jEjpbv2nISCRqOsjL
-47kU0UtJDHWCel/rgmwlexSr3ozOFjdYAlsEM7PeNVteYHk/MP5fdBDm5HrWpVUc
-L6XBM0UTkOc6eQjB6zcDvR+7riaNEYw+ldpVK0VkuHdMvkgS5wVGKEBQupvgMu3q
-bLyzw+5h47+tM9JdbPh/qVaHJ0YdSaKm7PP6h/tja4sv3xT2auRx87sYED5ApbCV
-3PFdqopI7RzKPrbe44oDBR8vhXOZHxB7F2cShOM=
-=/LLJ
+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
+fBpUtF7IcZuVODbaSotJGrVy6Vcc47U=
+=Mtyb
-----END PGP MESSAGE-----
---YHMt6qox5Q98ST4AQG72PmRsHN3WX9OVK--
+--rQTpXP7Mot8JXwKx13GEOPUvkBQfoDvqM--
diff --git a/enzevalos_iphoneTests/testMails/signedInlineThunderbird.eml b/enzevalos_iphoneTests/testMails/signedInlineThunderbird.eml
index 6bd4ad61..2f457ba6 100644
--- a/enzevalos_iphoneTests/testMails/signedInlineThunderbird.eml
+++ b/enzevalos_iphoneTests/testMails/signedInlineThunderbird.eml
@@ -2,7 +2,7 @@ Return-Path: <alice@enzevalos.de>
Delivered-To: bob@enzevalos.de
To: Bob <bob@enzevalos.de>
From: alice <alice@enzevalos.de>
-Subject: signed mail with inline pgp from thunderbird
+Subject: signed with inline from Thunderbird
Openpgp: preference=signencrypt
Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
xsDNBFp+5vsBDACuHCvqCBlUT1O+IIQ0LOWsA2l/UAa+7PHNHotZJ22BtR//fmkdrIesPye2
@@ -45,8 +45,8 @@ Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
PUGqnJ3Q4N73NoT8RNFru90P0HAgYPOMEphFh1T36OPCg7zIYuR1+eFu4mzpNirOU1MAYeVQ
cw1lQm55YnkGHnrDrikMLOk2ZqmWGw+8k96Xvsx7TrnrnPSa4uf/DbBo6Sd0xordGbSBeEJC
FRdV+uRcABCD6OuDTg==
-Message-ID: <65fe43e6-a951-0bb8-ede1-5497c08bb757@enzevalos.de>
-Date: Wed, 31 Oct 2018 11:26:35 +0100
+Message-ID: <d6a408af-f34d-d5bc-f74c-2ec9a70d3c15@enzevalos.de>
+Date: Wed, 31 Oct 2018 12:16:37 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
Gecko/20100101 Thunderbird/52.9.1
MIME-Version: 1.0
@@ -71,19 +71,18 @@ at ligula ultricies sagittis malesuada non est. Nam maximus varius
mauris. Etiam dignissim congue ligula eu porta. Nunc rutrum nisl id
mauris efficitur ultrices. Maecenas sit amet velit ac mauris consequat
sagittis at et lorem.
-
-----BEGIN PGP SIGNATURE-----
-iQGzBAEBCgAdFiEEJRxNIIPfYdSrprTDTbvambTX/SgFAlvZg1sACgkQTbvambTX
-/Sis/Av+KOas3AmpBEWRaZV7tttCJ2jTr4wmp/NHaXEZ1P1/XM0zYGy9iHEdTZsZ
-dLJfjRfVhBp3GMA1xx3E77fRbiF+pGXg9NkvKNL/c9W1knCt2wyXVAqQcq17U5vW
-t+gXG1osRyJev1/HrVbyq1zdTYnIrvnRYoFp1TrZRncZXh2cxGvhqZXtTu2nGy5A
-K+gciE7yejX4OAX0rwHT9K5g/tALx5Q0zxJmsomFKEmdep3OEaVdZrxRdcUY1bYi
-wMh4onH2OPgWaxLouv9xSglhi0LZsHpKqwD4o0h8UUUmf01tIa40erP9KRRMVtKL
-n5fYig5sK8sMc1vZxhT6VlRe4Zvdl+JgnUbqvy4a9D3vrFJLEG2T7VP1R86C5nQr
-O6B64j20UrKOHDLoTq3ZotfDS4Y//0qEEXgqZ8FMPRDWJSmfe9Vpbx1lorJR6MJM
-bmlYcDw0wph/xCJ5rChBjnoipbElg/wewpNfLtcEVjSzoHpQB8W9ZiITEcceQg30
-b9OryFLe
-=qiw4
+iQGzBAEBCgAdFiEEJRxNIIPfYdSrprTDTbvambTX/SgFAlvZjxUACgkQTbvambTX
+/SiZ0Av8DJ9xa/OX9TioSBtcOc3l/VdCZfm8vQCN0kiZTW8Mg9J3kZNOFsLwoqfz
+5aaBL/HVfpK9ZJSZLdUGfSrBxk+K6FJN7UW1Yzbkvo7Pec1Zof+DfUJSlZT5vJiZ
+naqJ/oW/nmgSSaaeBxWAOBgjQ5yQCaCN8vJLpMztl92zE5NUKP4FUL6V+HmXybMN
+P5cApXABamuYFY/v4FnYCeTZ/yjpBMrcF8bUr+f9yQ8Df4oQnQVAKKsdfJVwpY1v
+Pv1iRAeXa3p1YKDdxtDpqaVe66XqfBrRvrbGSNCIbIaF1Kh6ooLvmEjZLiJ9AdSx
+mEfVAJgcC69r4dR2R9Tph9odD2/WAKSnoTcA7x5pb4ZZfg/TXhNhVQeqOJ4XxlFZ
+u7lCeJzv8daFAs/7B31OKcXe0wYyOtBhXdQ0O5DkEubkYIFNR2918E4dUxQb1xKO
+JsRL+kuWEhFXSUXm87Wyph6lPdyMYHV82HG5FfQ65BPmxUkAvlVdZEwlXEjhiiXO
+eMyfhiTy
+=d3k6
-----END PGP SIGNATURE-----
diff --git a/enzevalos_iphoneTests/testMails/signThunderbird.eml b/enzevalos_iphoneTests/testMails/signedThunderbird.eml
similarity index 79%
rename from enzevalos_iphoneTests/testMails/signThunderbird.eml
rename to enzevalos_iphoneTests/testMails/signedThunderbird.eml
index 5412d33d..77fd59fc 100644
--- a/enzevalos_iphoneTests/testMails/signThunderbird.eml
+++ b/enzevalos_iphoneTests/testMails/signedThunderbird.eml
@@ -2,7 +2,7 @@ Return-Path: <alice@enzevalos.de>
Delivered-To: bob@enzevalos.de
To: Bob <bob@enzevalos.de>
From: alice <alice@enzevalos.de>
-Subject: sign mail from thunderbird
+Subject: signed from Thunderbird
Openpgp: preference=signencrypt
Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
xsDNBFp+5vsBDACuHCvqCBlUT1O+IIQ0LOWsA2l/UAa+7PHNHotZJ22BtR//fmkdrIesPye2
@@ -45,25 +45,25 @@ Autocrypt: addr=alice@enzevalos.de; prefer-encrypt=mutual; keydata=
PUGqnJ3Q4N73NoT8RNFru90P0HAgYPOMEphFh1T36OPCg7zIYuR1+eFu4mzpNirOU1MAYeVQ
cw1lQm55YnkGHnrDrikMLOk2ZqmWGw+8k96Xvsx7TrnrnPSa4uf/DbBo6Sd0xordGbSBeEJC
FRdV+uRcABCD6OuDTg==
-Message-ID: <0a3e1f89-73a8-da22-5afb-1430291e6cbf@enzevalos.de>
-Date: Wed, 31 Oct 2018 11:24:46 +0100
+Message-ID: <310eef89-5be5-6018-3ded-a9cda76a0342@enzevalos.de>
+Date: Wed, 31 Oct 2018 12:15:17 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0)
Gecko/20100101 Thunderbird/52.9.1
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
protocol="application/pgp-signature";
- boundary="T4IPURkwNKhiI9JJqz8fskA4uvD5zKnIq"
+ boundary="jGY9eHsM08PgfVXXPT2f3AZCPJW4IwZj4"
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
---T4IPURkwNKhiI9JJqz8fskA4uvD5zKnIq
-Content-Type: multipart/mixed; boundary="DNG54E5nkvGWZc6LwmSfJ9tadRP0lFhmY";
+--jGY9eHsM08PgfVXXPT2f3AZCPJW4IwZj4
+Content-Type: multipart/mixed; boundary="dibSubdyFVMsrRSzHsR83Pehjj4u2PlX3";
protected-headers="v1"
From: alice <alice@enzevalos.de>
To: Bob <bob@enzevalos.de>
-Message-ID: <0a3e1f89-73a8-da22-5afb-1430291e6cbf@enzevalos.de>
-Subject: sign mail from thunderbird
+Message-ID: <310eef89-5be5-6018-3ded-a9cda76a0342@enzevalos.de>
+Subject: signed from Thunderbird
---DNG54E5nkvGWZc6LwmSfJ9tadRP0lFhmY
+--dibSubdyFVMsrRSzHsR83Pehjj4u2PlX3
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Content-Language: en-US
@@ -84,26 +84,26 @@ sagittis at et lorem.
---DNG54E5nkvGWZc6LwmSfJ9tadRP0lFhmY--
+--dibSubdyFVMsrRSzHsR83Pehjj4u2PlX3--
---T4IPURkwNKhiI9JJqz8fskA4uvD5zKnIq
+--jGY9eHsM08PgfVXXPT2f3AZCPJW4IwZj4
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
-iQGzBAEBCgAdFiEEJRxNIIPfYdSrprTDTbvambTX/SgFAlvZgu4ACgkQTbvambTX
-/Sg4twv9HV8Yh8S9Cn2BqwUuyDWeI1y5U7WGMptjfZVPi7KxW7yVQfZvYsELkCn6
-Nkwaa4MD611WoNdD4Mx7PAGX47Hd1gKilH5CKkg47fvYYM2oxAJa6IxrZUWelBYw
-xfPBuOAAoyD1IvmU//p4O6zvkDpIwGjgnVzFGOLDOV6hzo9mfcQWZ6GGa0RCT0nn
-NwikcsNuCI8Zj17+IX105NJbRb0PJ4YqB6z4CY8mAVk2bFX1dtCKswZDVdfUoBME
-4Kcz62WgiN3c0Ya/1Ksq93H1weScILRDO1ViHG0MKyx9t65taYWA698p8DivbT0O
-nHFtC7rAyC5UdXOMT/pIOo1ZtusjQXjrg67Zuzs9qs5VsOid6MKjHMUE8KLVuj9/
-pGCoVxB4JY8DmXJCYvvfMAa0A3KgszOMECnljBP2GHsA9IdzINFQpT2SPFzxmajd
-xaZ3+/nH97javO5uBrYgR/mWQdKJ8n4GCgUQrVZM+ShpR/CAG7PatJufK8WLTvuq
-YaPqzxIM
-=eN+A
+iQGzBAEBCgAdFiEEJRxNIIPfYdSrprTDTbvambTX/SgFAlvZjsUACgkQTbvambTX
+/Sj26gv/VN0k/cDybI5RUU/qCIxcivOy3qM/9AauHjQQ/RJWlBAsVy/JU04xS+Qi
+DdLmXP9LJa8np5T9B/rVJZrVbv5FjidsY6UsPbcqRcTZGe/X8ikscpRqUlYqkeAI
+F4u2tKQiSaxbB4J9Mj4WindG3y3kcRUoTizFv7I7Zl6rLc2WVayLwFaA79pDv3M9
+NEgwv5i7gE48dppEJLUBeXtpK00N5/BxJ0w7L0hirQZFo7FMTkDgCbYA+9seDfS4
+lx4aHYjB+BUsV1n7dO6bdumnutP3eK1awk2Yyq4EJHizLNd/SsWVltOxukRqrUAp
+qFlwclAEOxlWs0uLckMU6jZnhk4nUC8S20MLznNN4ASBjdo4mRIZFHIq9X8qLikl
+uUvxM1Tj3+Vx/6JvHI3kxrq68QARkvTKOMOcLnPUOlQgEvUe9JZvJfSdm2xhqVa+
+vBWUTsso1k+G40NdpH72SlTxFdIOlg5GX4MVVXzDyt+t2z+PVZFOPhMyp25h7efS
+JPEF5Jke
+=SZPp
-----END PGP SIGNATURE-----
---T4IPURkwNKhiI9JJqz8fskA4uvD5zKnIq--
+--jGY9eHsM08PgfVXXPT2f3AZCPJW4IwZj4--
--
GitLab