diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 651e77bc69c10bbecdfa7d1dada48d0dbb99d692..57cec2b19b4a2f8c74b5de6719d7eaf9b4c025f5 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -181,6 +181,11 @@
47CEF4EB2052C3C800887CDB /* ObjectivePGP.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 47CEF4EA2052C3C700887CDB /* ObjectivePGP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
47CEF4ED2052C3E700887CDB /* ObjectivePGP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47CEF4EC2052C3E600887CDB /* ObjectivePGP.framework */; };
47D1302B1F7CEE6D007B14DF /* DebugSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47D1302A1F7CEE6D007B14DF /* DebugSettings.swift */; };
+ 47E7BE5B22319B6900C8EF94 /* EncMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE5A22319B6900C8EF94 /* EncMailFromMac.eml */; };
+ 47E7BE5D22319B7100C8EF94 /* SignedMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE5C22319B7000C8EF94 /* SignedMailFromMac.eml */; };
+ 47E7BE5F22319B7D00C8EF94 /* SecureMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE5E22319B7D00C8EF94 /* SecureMailFromMac.eml */; };
+ 47E7BE6122319B8F00C8EF94 /* PlainMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE6022319B8F00C8EF94 /* PlainMailFromMac.eml */; };
+ 47E7BE632232BD0A00C8EF94 /* SignedEncMailFromMac.eml in Resources */ = {isa = PBXBuildFile; fileRef = 47E7BE622232BD0A00C8EF94 /* SignedEncMailFromMac.eml */; };
47F79240203492E3005E7DB6 /* KeyRecord+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F7923E203492E3005E7DB6 /* KeyRecord+CoreDataClass.swift */; };
47F79241203492E3005E7DB6 /* KeyRecord+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F7923F203492E3005E7DB6 /* KeyRecord+CoreDataProperties.swift */; };
47F867E02052B47C00AA832F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47F867DF2052B47C00AA832F /* Security.framework */; };
@@ -378,6 +383,11 @@
47CEF4EA2052C3C700887CDB /* ObjectivePGP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ObjectivePGP.framework; sourceTree = "<group>"; };
47CEF4EC2052C3E600887CDB /* ObjectivePGP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjectivePGP.framework; path = ../enzevalos_iphone_workspace/ObjectivePGP.framework; sourceTree = "<group>"; };
47D1302A1F7CEE6D007B14DF /* DebugSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DebugSettings.swift; sourceTree = "<group>"; };
+ 47E7BE5A22319B6900C8EF94 /* EncMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EncMailFromMac.eml; sourceTree = "<group>"; };
+ 47E7BE5C22319B7000C8EF94 /* SignedMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SignedMailFromMac.eml; sourceTree = "<group>"; };
+ 47E7BE5E22319B7D00C8EF94 /* SecureMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SecureMailFromMac.eml; sourceTree = "<group>"; };
+ 47E7BE6022319B8F00C8EF94 /* PlainMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PlainMailFromMac.eml; sourceTree = "<group>"; };
+ 47E7BE622232BD0A00C8EF94 /* SignedEncMailFromMac.eml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SignedEncMailFromMac.eml; sourceTree = "<group>"; };
47F7923E203492E3005E7DB6 /* KeyRecord+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyRecord+CoreDataClass.swift"; sourceTree = "<group>"; };
47F7923F203492E3005E7DB6 /* KeyRecord+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyRecord+CoreDataProperties.swift"; sourceTree = "<group>"; };
47F867DF2052B47C00AA832F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
@@ -595,6 +605,11 @@
470709112189BB4A00DF71A3 /* testMails */ = {
isa = PBXGroup;
children = (
+ 47E7BE622232BD0A00C8EF94 /* SignedEncMailFromMac.eml */,
+ 47E7BE5A22319B6900C8EF94 /* EncMailFromMac.eml */,
+ 47E7BE6022319B8F00C8EF94 /* PlainMailFromMac.eml */,
+ 47E7BE5E22319B7D00C8EF94 /* SecureMailFromMac.eml */,
+ 47E7BE5C22319B7000C8EF94 /* SignedMailFromMac.eml */,
47C22282218B02C700BD2C2B /* autocryptSimpleExample1.eml */,
4707092F2189E1C000DF71A3 /* enc+signedThunderbird.eml */,
470709212189C73900DF71A3 /* enc+signedInlineThunderbird.eml */,
@@ -1229,17 +1244,22 @@
buildActionMask = 2147483647;
files = (
470709262189C73900DF71A3 /* enc+signedInlineThunderbird.eml in Resources */,
+ 47E7BE632232BD0A00C8EF94 /* SignedEncMailFromMac.eml in Resources */,
479B597B20691C1A00B3944D /* ObjectivePGP.framework in Resources */,
470709282189C73900DF71A3 /* encInlineThunderbird.eml in Resources */,
470709292189C73900DF71A3 /* signedInlineThunderbird.eml in Resources */,
8428A8841F436ACC007649A5 /* GamificationElements.xcassets in Resources */,
4707092D2189C74200DF71A3 /* bobSecret.asc in Resources */,
+ 47E7BE5B22319B6900C8EF94 /* EncMailFromMac.eml in Resources */,
4707091E2189BC3500DF71A3 /* plainThunderbird.eml in Resources */,
4707092E2189C74200DF71A3 /* alicePublic.asc in Resources */,
4707092A2189C73900DF71A3 /* signedThunderbird.eml in Resources */,
47C22283218B02C700BD2C2B /* autocryptSimpleExample1.eml in Resources */,
470709302189E1C100DF71A3 /* enc+signedThunderbird.eml in Resources */,
+ 47E7BE6122319B8F00C8EF94 /* PlainMailFromMac.eml in Resources */,
470709272189C73900DF71A3 /* encThunderbird.eml in Resources */,
+ 47E7BE5D22319B7100C8EF94 /* SignedMailFromMac.eml in Resources */,
+ 47E7BE5F22319B7D00C8EF94 /* SecureMailFromMac.eml in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/enzevalos_iphoneTests/MailTest.swift b/enzevalos_iphoneTests/MailTest.swift
index 3b4f158b035b3a8c2000b48e107ee0e7d06fff70..49a44cc91e80a16a5b8f970f59158c4ace19aef4 100644
--- a/enzevalos_iphoneTests/MailTest.swift
+++ b/enzevalos_iphoneTests/MailTest.swift
@@ -218,10 +218,23 @@ class MailTest: XCTestCase {
testMailAliceToBob(name: "encInlineThunderbird", isSecure: false, encState: EncryptionState.ValidedEncryptedWithCurrentKey, sigState: SignatureState.NoSignature)
}
func testThunderbirdSigedInlineMail() {
- //testMailAliceToBob(name: "signedInlineThunderbird", isSecure: false, encState: EncryptionState.NoEncryption, sigState: SignatureState.ValidSignature)
+ testMailAliceToBob(name: "signedInlineThunderbird", isSecure: false, encState: EncryptionState.NoEncryption, sigState: SignatureState.ValidSignature)
}
func testThunderbirdSigedMail() {
- //testMailAliceToBob(name: "signedThunderbird", isSecure: false, encState: EncryptionState.NoEncryption, sigState: SignatureState.ValidSignature)
+ testMailAliceToBob(name: "signedThunderbird", isSecure: false, encState: EncryptionState.NoEncryption, sigState: SignatureState.ValidSignature)
+ }
+
+ func testMacPlainMail() {
+ testMailAliceToBob(name: "PlainMailFromMac", isSecure: false, encState: EncryptionState.NoEncryption, sigState: SignatureState.NoSignature)
+ }
+ func testMacSecureMail(){
+ testSecureMail(name: "SignedEncMailFromMac")
+ }
+ func testMacEncMail(){
+ testMailAliceToBob(name: "EncMailFromMac", isSecure: false, encState: EncryptionState.ValidedEncryptedWithCurrentKey, sigState: SignatureState.NoSignature)
+ }
+ func testMacSigedMail() {
+ testMailAliceToBob(name: "SignedMailFromMac", isSecure: false, encState: EncryptionState.NoEncryption, sigState: SignatureState.ValidSignature)
}
func testSecureMail(name: String) {
@@ -241,7 +254,11 @@ class MailTest: XCTestCase {
let incMail = IncomingMail(rawData: mailData, uID: 4, folderPath: "INBOX", flags: MCOMessageFlag.init(rawValue: 0))
if let mail = incMail.store(keyRecord: nil) {
XCTAssertEqual(mail.isSecure, isSecure)
- if mail.isSecure || mail.sigState == .ValidSignature{
+ if let sig = sigState, sig == .ValidSignature{
+ XCTAssertEqual(mail.signedKey?.keyID, alice)
+ XCTAssertEqual(mail.keyID, alice)
+ }
+ if isSecure{
XCTAssertEqual(mail.signedKey?.keyID, alice)
XCTAssertEqual(mail.keyID, alice)
}
@@ -254,6 +271,9 @@ class MailTest: XCTestCase {
let body = mail.body
XCTAssertEqual(body.removeNewLines(), MailTest.body.removeNewLines())
XCTAssertTrue(MailTest.compareAdrs(adrs1: ["bob@enzevalos.de"], adrs2: mail.getReceivers()))
+ for x in mail.getReceivers() {
+ print(x.address)
+ }
}
else {
XCTFail()
@@ -264,7 +284,6 @@ class MailTest: XCTestCase {
let aliceKeyId = importKey(file: "alicePublic", isSecretKey: false)
if addAlice {
let b = datahandler.newPublicKey(keyID: aliceKeyId, cryptoType: .PGP, adr: "alice@enzevalos.de", autocrypt: true)
- print(b.keyID)
}
let bobKeyId = importKey(file: "bobSecret", isSecretKey: true)
_ = datahandler.newSecretKey(keyID: bobKeyId, addPk: true)
diff --git a/enzevalos_iphoneTests/testMails/EncMailFromMac.eml b/enzevalos_iphoneTests/testMails/EncMailFromMac.eml
new file mode 100644
index 0000000000000000000000000000000000000000..0478201e4e25b72619a9fd835b0ca825f3c42d92
--- /dev/null
+++ b/enzevalos_iphoneTests/testMails/EncMailFromMac.eml
@@ -0,0 +1,64 @@
+From: alice@enzevalos.de
+Content-Type: multipart/encrypted;
+ boundary="Apple-Mail=_AA655859-23B9-4360-85CB-8C21BDBE3FB1";
+ protocol="application/pgp-encrypted"
+Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\))
+Subject: EncMailFromMac
+X-Universally-Unique-Identifier: FDED77CA-F304-4052-92A9-AAA27A78FF39
+Message-Id: <D2EDF774-9085-4735-8F57-2254387C839A@enzevalos.de>
+Date: Fri, 8 Mar 2019 16:06:29 +0100
+To: Bob <bob@enzevalos.de>
+
+This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)
+--Apple-Mail=_AA655859-23B9-4360-85CB-8C21BDBE3FB1
+Content-Transfer-Encoding: 7bit
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME Versions Identification
+
+Version: 1
+
+--Apple-Mail=_AA655859-23B9-4360-85CB-8C21BDBE3FB1
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline;
+ filename=encrypted.asc
+Content-Type: application/octet-stream;
+ name=encrypted.asc
+Content-Description: OpenPGP encrypted message
+
+-----BEGIN PGP MESSAGE-----
+
+hQGMA26fFf9Ygp7zAQv+JjvbKRQi2F/KFVSiPdmxAytklM3HCw3EZscCpNSfKGZ2
+o9Zd1xGjkVBcIcdUZWYDDpNuB7IX1ikg0Q9FkDavlI6Lcu3aZdx/ZBt5uZQM7HFm
+7WuYnzMtidymHyNs7LcTNqZdNwHd3AYc+XyTOox8bbvbk8ojcdrIgxqeC6MqX1ch
+2NTR1jDdAu0OpRAEMuwbHYSe0vCxSsnPsptUaErl0bT8N++rmghp+n9CIQ5QtvZ8
+Yze88B6YDx77eEcVnWR3Abmw9/dZSEdlzbVQZvInOIUktAGN34kj4qUZR/CisfXj
++tkvI2BQW5closNAwo/jm9+8inq5j6PjFkJ5r/xKAyRrh3m6M/d4KIUI0qFj3v2M
+jSihyfehxewcMLO1oHYwRGJF9Ldb95XPWsWe/OFXuQEvNxeQUvsiL0eC3ZNQ8EJ0
+nrzMUs/M6jxEg+o1rH7CTPwPqbjArO5qyLnBAYWrQJUFM9a20Z+/INBrG5aNTJCb
+pmVrw8KogTYUMWQonZHahQGMA6mH5Wf4h8YiAQv9HreKJ5Q2PvFtRbbuN8MFNZ9X
+gQVwe0o0EBjIJetKb7/rNVbRukcrlpDHG+8B8Wir/P4loYqNGgLZl0RUrzK5RuxB
+qu3M+eS7U+gMp4iOu/ohFChqhOXKWdStyGRT2gxX+YsjvAq+BH1fCY43yFCPKt/u
+effbA1Hixrc+ZMs7LFVJouBMgQC+kddptfeWx3vykcuTgrfytAqNg9fsV7XlfM2D
+wvzO4Xjv30i8lS2j2nUx1M/d6IlUTkMQjGpQjZV1aL4k7oZmF2msaXveTm6y8e7n
+9TO83xrGXic0YWD0c6hUrJwluLlraQeUXrrKsMydX7CRfU0Lvs3aENp1qQ5akFzB
+uqSm73bgijCMCjd1TdMySdC8A7vYZiItX2xh6VKvVAuWXxlRjr38yCnEHkLbhGNJ
+liGrNRTmP/z9+3kE1cTvJvSkIfoy3EhU7/cyc9z4QGCyMEYBikTOlveynMsthEQW
+QnLr6q6CFiD78Eko1Ajv2uCRR3XX7C8y+wB4BNIl0ukB9Ri66NLKIDLB49wB5ru0
+c8PCYuHvcha42jV6rJOp9ATd3kd4zoZ9/5xtEml6yfua0ijfQlNHzBL2qzIc8e2e
+YYoXdyaJcbdxy+DiRVNqStH8lpv1ABNz/AZRgLCjutjqdv81uZj0cQmKnxyb84Uy
+FJd6TsTaW5ictU7q28O6/hy7Af6BzFgBSGJ7l9cD9kiO2m5d5rjBYtbItCYSxfiQ
+toU+2NK/vahH+0yL5zE825TsvZ6nRzW2y+8w1Z8H5980JDgUFfUPjVbJ02dytbCe
+UCofCxBeEK8iBhLAqphhMWg8YIHUoHKAAkz4ZbQBiA7MBzvYc0r8iwusxx6MzQQq
+Kw/RP41Su8ZX6m9DuTixLj0tb+Trz45shR1mBt6VRwcYdWrnKNheUzyVhTTJzTcQ
+NseRFK/4mEOOBFOM9oBBllDjtG7ZAWxGAfCJfuEdaUxGZON05NO6NWyjVvoFfCIH
+yvrPhm+2dxrSK/m1NGyCKpnwMngi1967A99exVx/6VgeFnDQnuAX+8mJPWWRY9mG
+bpW4x+E3eUiJLHyg8+cLU+CP7gkE3wrSOBCp2cFE2EWj7ZW5olxuUNJ3nXXx726I
+FtQ7uu6RM4ZQYpQ7Kx3E2jZ3ENGeUG2qDTR16jdOYgmntf4xmDbXKOyzKp5bZhTI
+D+il9z35JXUqD0zhHa30n5LOXj66VjTHaogAKIHVCIl1FyxdeP8rAIYZWmZcM7G3
+Hu5p6nCtHS6kOePotDrCi+wanjr4kaZlVL1Z0/IfmttYAnIJcpueW2Zv9SMmWRmD
+WNC/qkAnocQ5F5+3xGwGk381rsFsJ02F0z1PrDpgzDXR0MNZsBVw8K4JiT2csBbh
+vdVk+lJ98T++9LZqhx5i2d5llg==
+=h5an
+-----END PGP MESSAGE-----
+
+--Apple-Mail=_AA655859-23B9-4360-85CB-8C21BDBE3FB1--
diff --git a/enzevalos_iphoneTests/testMails/PlainMailFromMac.eml b/enzevalos_iphoneTests/testMails/PlainMailFromMac.eml
new file mode 100644
index 0000000000000000000000000000000000000000..2dcaf272735a26495de6cf386300cd38a6d5bf25
--- /dev/null
+++ b/enzevalos_iphoneTests/testMails/PlainMailFromMac.eml
@@ -0,0 +1,24 @@
+From: alice@enzevalos.de
+Content-Type: text/plain;
+ charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\))
+Subject: PlainMailFromMac
+X-Universally-Unique-Identifier: 241ED33E-49BA-40A1-ACE3-A59A3CB29409
+Message-Id: <D0FEF8FA-E918-4005-AE8F-97EC259643AB@enzevalos.de>
+Date: Fri, 8 Mar 2019 16:05:37 +0100
+To: Bob <bob@enzevalos.de>
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque dapibus =
+id diam ac volutpat. Sed quis cursus ante. Vestibulum eget gravida =
+felis. Nullam accumsan diam quis sem ornare lacinia. Aenean risus risus, =
+maximus quis faucibus et, maximus at nunc. Duis pharetra augue libero, =
+et congue diam varius eget. Nullam efficitur ex purus, non accumsan =
+tellus laoreet hendrerit. Suspendisse gravida interdum eros, eu =
+venenatis ante suscipit nec. Class aptent taciti sociosqu ad litora =
+torquent per conubia nostra, per inceptos himenaeos. Praesent =
+pellentesque cursus sem, non ornare nunc commodo vel. Praesent sed magna =
+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.=
diff --git a/enzevalos_iphoneTests/testMails/SecureMailFromMac.eml b/enzevalos_iphoneTests/testMails/SecureMailFromMac.eml
new file mode 100644
index 0000000000000000000000000000000000000000..079bff29ea83ba0c20e6a481e3e3510c9ce1a38f
--- /dev/null
+++ b/enzevalos_iphoneTests/testMails/SecureMailFromMac.eml
@@ -0,0 +1,82 @@
+From: Bob <bob@enzevalos.de>
+Content-Type: multipart/encrypted;
+ boundary="Apple-Mail=_C1C52216-4BAA-4FC0-A19C-AA3FC60A85AA";
+ protocol="application/pgp-encrypted"
+Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\))
+Subject: SecureMailFromMac
+X-Universally-Unique-Identifier: 99105245-D56C-4094-8BAC-2D0CF17B007B
+Message-Id: <CEB95276-3FA2-430F-861D-9444C4169BEC@enzevalos.de>
+Date: Thu, 7 Mar 2019 19:30:23 +0100
+To: alice <alice@enzevalos.de>
+
+This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)
+--Apple-Mail=_C1C52216-4BAA-4FC0-A19C-AA3FC60A85AA
+Content-Transfer-Encoding: 7bit
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME Versions Identification
+
+Version: 1
+
+--Apple-Mail=_C1C52216-4BAA-4FC0-A19C-AA3FC60A85AA
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline;
+ filename=encrypted.asc
+Content-Type: application/octet-stream;
+ name=encrypted.asc
+Content-Description: OpenPGP encrypted message
+
+-----BEGIN PGP MESSAGE-----
+
+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
+=YkYS
+-----END PGP MESSAGE-----
+
+--Apple-Mail=_C1C52216-4BAA-4FC0-A19C-AA3FC60A85AA--
diff --git a/enzevalos_iphoneTests/testMails/SignedEncMailFromMac.eml b/enzevalos_iphoneTests/testMails/SignedEncMailFromMac.eml
new file mode 100644
index 0000000000000000000000000000000000000000..78e06b41662a5c6e4ee2b9409440bbbb4550898c
--- /dev/null
+++ b/enzevalos_iphoneTests/testMails/SignedEncMailFromMac.eml
@@ -0,0 +1,82 @@
+From: alice@enzevalos.de
+Content-Type: multipart/encrypted;
+ boundary="Apple-Mail=_E717ABD6-2F3E-4DB6-B2B6-18CAA74AABE5";
+ protocol="application/pgp-encrypted"
+Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\))
+Subject: SignedEncMailFromMac
+X-Universally-Unique-Identifier: 2747EA7F-7618-4A4D-9779-478BEC618434
+Message-Id: <ECE1713C-DBDD-4C3F-8672-FDF48F1EB911@enzevalos.de>
+Date: Fri, 8 Mar 2019 16:07:06 +0100
+To: Bob <bob@enzevalos.de>
+
+This is an OpenPGP/MIME encrypted message (RFC 2440 and 3156)
+--Apple-Mail=_E717ABD6-2F3E-4DB6-B2B6-18CAA74AABE5
+Content-Transfer-Encoding: 7bit
+Content-Type: application/pgp-encrypted
+Content-Description: PGP/MIME Versions Identification
+
+Version: 1
+
+--Apple-Mail=_E717ABD6-2F3E-4DB6-B2B6-18CAA74AABE5
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline;
+ filename=encrypted.asc
+Content-Type: application/octet-stream;
+ name=encrypted.asc
+Content-Description: OpenPGP encrypted message
+
+-----BEGIN PGP MESSAGE-----
+
+hQGMA26fFf9Ygp7zAQv/anVUJhV3w7wikykGoZN/plvPFI2n7HuP1AVcsacNXsuG
+PQtBcXzKnSm1XQgPWzhmhW8fSlaYunppXjo4DQE1WbbVsYNKH3rjSILCXZkOSPDG
+Zqd60CxUKguajM+sLi24CWh2EpIsyl6SWlx3Zzgrna3dSRCWK6Q1yFRj5LL8FzYM
+4ks4K2RqnYQv1CRnAMWo0XrDnbP1ZRxJAnEtPK0Vmz4XWCOThMO1VkwMINw4tKpm
+Mrpp2xlgi26qXBX660yH6JbpVTVdDxwEokypZGBuTVr1nNVBwUd84H3wQXR7sH7A
+Ic4kujZOCQ92w9Bkk7HKEUINQHQX0h/JYx5WZLGtg8XNtoz7gLtKKhMAnqd3q/RT
+6ozZuEDzpz4W5Qk6XRVquO30ZX+5VD4G0v64A/u4mt6pIRMaXIB2B555ZdqU2RyA
+V9gpPD9QLJYY1W3dkjPUuP9UhdFX7u5nlI//342urvqj5R82T4MJKYUZ/nVKlxy8
+oU84hvXr/+8cp++56RGphQGMA6mH5Wf4h8YiAQwAkiFWnFQDq9EJDEWq0XM7QXk7
+D0JOhuyaefi2E7GuOhdboOj4fFr8wk/Jt4PSn3/Xc69WfHVRrneb7WdB5LjEEguh
+8WyE1yFBa2W186uCR/k6AtqG+kEqJ9PnXdi0fAzN7wKRibkTTvyy+MN2FxI39E05
+P4nCoOg6FpUkFpd6p2Zj6S7zaqExpdPc05acKYg0yRafbc4z11fQ9wNfT5OivGWE
+rtZIKczNUJMbOO6J/rI4/FcoL38V1Fx4BHoI45ekgVwn0P2wpkaeCEwiOQZt53M1
+Q4Mc4BvaLbYsA8pfCPZZz0yvHhbWy7Mv0+bNHBHOt/btLMo79OdlsSls4XAPaBhk
+8egD96UmMnCAuBZye441QUqVlsuK9tpBEDlp+/PFnAoJoz2Z8hjGwnO5U7cuwqvh
+zi7AaMGIj5/wR5oyk6rzaJ+0EEZ1wLcPuzTwonbikLyhVIfKbC09lpWChBDArGlg
+pbcjE3RTHEcv4SCNetnFxjlVtRvH0IcHJVDlP6Sf0uoBjIUadvWPHwOHasq309wv
+3M811lkpQD4rs8wSujZ9vyXRku7rNQwuAzou1+fQD/0HAGB4UL9D0qnuJVGLrzxH
+oxIIKtM4a/JtVLlQST1OJ63A97W8P/YgfXgp4pHU1Lbi/cuXQNoRBN+TR5zBPdqc
+dseEdvqWdlKKC4rJ4Bmxd9TaGUvxapLTJc++bOlTkRyBbQsN4jdSSguGvFJBcns0
+oVMl9UnA5wO3S4u6cBzs7TNTFVjoShjamnBbvzDQO9ZeudxrGIVP/M81s1/Jaizh
+m8SP8UI5pYJiy8ZVMYYZWMsIKU8kPPQAXeNZCRBUyhBsHgf4WOIYxC2GiYKnbl4B
+PwIwYUh6nPs8tisqsq4m02JblxbF9EPGkG+0or9S9FL3Hj/Vehbdkn3NYZYU7ord
+sK+6d6H3x9P9778K+hK4qu3GR/HEplrTVKar9OYPkuynrBZVtTpVY6DoayqHVh4d
+U08KhFWykd+WVuXLo3r8PctHR4qTg8UoeosEA1vcl2VXk9WKpErShQJVNrSnSfYw
+FrVo6Q5ibRXBHTBHEe8fRJepTRxOIwA2wO8yAdkJzTRt5aula90x69BXYk9Aih7H
+OOoSLLvYsDQZ3ZYY3bvT9a6okdV8XFq/RikwLurxSQITa6UWn+D7fMFUXmXQpBli
+IHcyFzo8VQFEljzKyJXGe1VOq8SmnG5aBMuiHBP7r+LCgmrdcwQdwbdH2iCeQpvf
+ifpCTQcf13bxugc9ZH6RTV6s5QfWJwhoK0xKyQ9rnWqUy7DPw/M9JmO3WNZOght0
+H0n+xI1OZRzG4bOYWSuoZfSc91A6+LEIX/JoA/bKKLbNQRc4OfiCYt7x3ABGEivq
+D3f6UPZj1A0srTRnqoTaSJeQ/OB43eIkWIX3yWFYERsjkkpJIVefclMSNgDQWnVE
+QL4BXlrEa+SAFhGhm1EznCSVE3b6GFcUdtZc9HFzdCtuqjUv5tSuf87cJM2amGMB
+frrkOxaJBw/VChyGsso2fAnWz6KbBolN7MPWePvitJWnSkOnoAa75eqVHJh0yLYe
+Smk39D+b81/wMyAk1OazYS4AHgGuG5p8QfYqhJuScfPOH5WW3qW+0wa/mkurv3E+
+8LEdHTNR+TL7HgRh4rkLCQS5TPSoIsPWgYHGTPxuHhcv8EgeWWAnhlAIMUhcVe2j
+DWlyPST0XOG54lF+RuxJGH5heK6JZY/G7Ax/sEX7Ly+kzu1jz489RgSOtvkIcKQp
+l47nIm2x0xizOhGN6sKxQ0npLQO8ZevxKYKwL5NfGlAa8j67d39g3zU/bTaNv6J8
+2q76rqXAPbmZmNoMd5gNXzZtGvYplbtvF2qJJkDCumj1hgk24D+Tl7qbkplfvAiO
+6a/lXxftfXwNHFywnfkRweuPLK4SpF+i89bZKtFDBfJ5evN+z0yJyKNAIxg7tfW5
+ebefUkoNRO4ws/OHEcv63FC04Sv6myVeAKpFEaDk89ic/46I/HoxhC01782YwkGv
+YDMedfrYmlkKjxYDs8Yi9NuAVDPHUznLADcIk+quNXeXlD/sTFuC02d93/uOvaPG
+eOnlcBtvPRelzp8MNLQrX9eMAi5+OqHCF1mtuefNh2cjMv/A9FeCiAe8/6lc94QW
+vL6VMtK2HgteELpWMZ23ZBDf/xT/BgS7YVQ4BQRI1Ftjp3hw0s+ljG6iFKUo2zIX
+C/colikGh005wkVHbhavMnztutPg2ImQfub21OdL1QYht1P/C/KxsQcWxp0J5EuJ
+o3olRmYbEA5pmK9Lu8Iuaf0cE/RO2vwb+gFIE2D/Lf1HwGWW+36ZqZ5csRWP1nl7
+AY5PshdJbshnbnlAfOaXuT5GuI2lXbB/1nsBh3fvKvl/4hFf0IrB2IQsNCucCpMm
+0sTlE45XD9mkfYdFiNFBqqnei1/RFsNKboa2Kf+Kfcx1bUtS/YfzS3goeyzLlP2b
+kBAGqBWpegFtS/7/MuJ7qT+RHV9TicEGY5RXf01ihxjoQw4aFBZ61YhkjLNgn5Lg
+tu0YXpPm447ZioFtRhn3P8DcJmgaMu/PjuqZGBznAn9mDHJmaRW0GLVMCZbqtA==
+=GYQG
+-----END PGP MESSAGE-----
+
+--Apple-Mail=_E717ABD6-2F3E-4DB6-B2B6-18CAA74AABE5--
diff --git a/enzevalos_iphoneTests/testMails/SignedMailFromMac.eml b/enzevalos_iphoneTests/testMails/SignedMailFromMac.eml
new file mode 100644
index 0000000000000000000000000000000000000000..f57b6385022b77fb707509c81b2b675d1942598b
--- /dev/null
+++ b/enzevalos_iphoneTests/testMails/SignedMailFromMac.eml
@@ -0,0 +1,56 @@
+From: alice@enzevalos.de
+Content-Type: multipart/signed;
+ boundary="Apple-Mail=_6FD29211-359B-4D3D-B663-021FB90ACCE7";
+ protocol="application/pgp-signature";
+ micalg=pgp-sha512
+Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\))
+Subject: SignedMailFromMac
+X-Universally-Unique-Identifier: 7A5006B1-1904-4D3A-A155-2ADE87BF1B50
+Message-Id: <BF47E140-788D-46A8-BB4D-822CE1C8C158@enzevalos.de>
+Date: Fri, 8 Mar 2019 16:17:20 +0100
+To: Bob <bob@enzevalos.de>
+
+
+--Apple-Mail=_6FD29211-359B-4D3D-B663-021FB90ACCE7
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+ charset=us-ascii
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque dapibus =
+id diam ac volutpat. Sed quis cursus ante. Vestibulum eget gravida =
+felis. Nullam accumsan diam quis sem ornare lacinia. Aenean risus risus, =
+maximus quis faucibus et, maximus at nunc. Duis pharetra augue libero, =
+et congue diam varius eget. Nullam efficitur ex purus, non accumsan =
+tellus laoreet hendrerit. Suspendisse gravida interdum eros, eu =
+venenatis ante suscipit nec. Class aptent taciti sociosqu ad litora =
+torquent per conubia nostra, per inceptos himenaeos. Praesent =
+pellentesque cursus sem, non ornare nunc commodo vel. Praesent sed magna =
+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.
+
+--Apple-Mail=_6FD29211-359B-4D3D-B663-021FB90ACCE7
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename=signature.asc
+Content-Type: application/pgp-signature;
+ name=signature.asc
+Content-Description: Message signed with OpenPGP
+
+-----BEGIN PGP SIGNATURE-----
+
+iQGzBAEBCgAdFiEEJRxNIIPfYdSrprTDTbvambTX/SgFAlyCh4AACgkQTbvambTX
+/SjHQAwAn+b0kGOcgfXEoFslecOZIDYINM9tUNHiBXH1S+5yZYE0PqWFQOfamAqC
+8gGwuo4+p4LxeFttGf6qNQADIVHKimGkI7wZ+WHpY6r+qtccbZaWQ2e8dqgATdFw
+QrM2JpJKvWyCE3+AEeKJscz36dcY8XYC9mXDkwW0gKbVLJFmUufQk8VchULDy23k
+LNbPKzGb/wHpNR1eUO+VzGH2wBmuY5tn3Ahe/NqzmouI8Ypaw9C//R2ETblCZN3P
+5s+MsEpxCt8NynLTpKU/3/iWBTkWkj5t7ACnkL14V9IFOpTkBFmhKhNa1qT1olkg
+DDCOHcpI8jy24ibCGE1/1Wi3Vf66IGj7rWpGJobqc8OiW+IcQi3dyH4T7NIkzqCL
+5iVkKODgotDIaZzKauVblRbYUEBSNEGhivZepOu+Mzyc8zDYngn3Elmf+9B+NyPv
+UxOMrSZ9E/AbV4AhKd8MLBnRcyvu1fvBogFNb4jDVdfVfMeKkK+tfMc05LHDfdlg
+HyLPlFy1
+=Kj4W
+-----END PGP SIGNATURE-----
+
+--Apple-Mail=_6FD29211-359B-4D3D-B663-021FB90ACCE7--