diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate
index 6cc6bd9a291384d315b6a5ea6986e131b80b5a5b..b6dd1609ca15037a65987e4ed006ac0085903e7a 100644
Binary files a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate and b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 40d1c84f5211bcaada12b8e9cbcc2f092b690914..5dae3a24bd27200c1d70eb13e805ff1cac461b2e 100644
--- a/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/enzevalos_iphone.xcworkspace/xcuserdata/Olli.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -752,11 +752,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "236"
- endingLineNumber = "236"
+ startingLineNumber = "207"
+ endingLineNumber = "207"
landmarkName = "decryptedMime(_:from:)"
landmarkType = "7">
</BreakpointContent>
@@ -768,11 +768,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "216"
- endingLineNumber = "216"
+ startingLineNumber = "187"
+ endingLineNumber = "187"
landmarkName = "decryptedMime(_:from:)"
landmarkType = "7">
</BreakpointContent>
@@ -1390,11 +1390,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "561"
- endingLineNumber = "561"
+ startingLineNumber = "532"
+ endingLineNumber = "532"
landmarkName = "PGPEncryption"
landmarkType = "3">
</BreakpointContent>
@@ -1614,11 +1614,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "580"
- endingLineNumber = "580"
+ startingLineNumber = "551"
+ endingLineNumber = "551"
landmarkName = "getMaxIndex(_:)"
landmarkType = "7">
</BreakpointContent>
@@ -1978,11 +1978,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "517"
- endingLineNumber = "517"
+ startingLineNumber = "516"
+ endingLineNumber = "516"
landmarkName = "@implementation PGPSignaturePacket"
landmarkType = "3">
</BreakpointContent>
@@ -2010,11 +2010,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "557"
- endingLineNumber = "557"
+ startingLineNumber = "556"
+ endingLineNumber = "556"
landmarkName = "-parseV3PacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2026,11 +2026,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "686"
- endingLineNumber = "686"
+ startingLineNumber = "685"
+ endingLineNumber = "685"
landmarkName = "-parseV4PacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2042,11 +2042,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "577"
- endingLineNumber = "577"
+ startingLineNumber = "576"
+ endingLineNumber = "576"
landmarkName = "-parseV3PacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2074,11 +2074,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "345"
- endingLineNumber = "345"
+ startingLineNumber = "344"
+ endingLineNumber = "344"
landmarkName = "-signData:secretKey:passphrase:userID:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2306,11 +2306,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "535"
- endingLineNumber = "535"
+ startingLineNumber = "534"
+ endingLineNumber = "534"
landmarkName = "-parsePacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2322,11 +2322,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "548"
- endingLineNumber = "548"
+ startingLineNumber = "547"
+ endingLineNumber = "547"
landmarkName = "-parsePacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2354,11 +2354,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "612"
- endingLineNumber = "612"
+ startingLineNumber = "611"
+ endingLineNumber = "611"
landmarkName = "-parseV3PacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2370,11 +2370,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "965"
- endingLineNumber = "965">
+ startingLineNumber = "964"
+ endingLineNumber = "964">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@@ -2400,11 +2400,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "598"
- endingLineNumber = "598"
+ startingLineNumber = "597"
+ endingLineNumber = "597"
landmarkName = "-parseV3PacketBody:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2448,11 +2448,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "980"
- endingLineNumber = "980">
+ startingLineNumber = "979"
+ endingLineNumber = "979">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@@ -2490,7 +2490,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/MailHandler.swift"
@@ -2506,15 +2506,15 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "481"
- endingLineNumber = "481"
+ startingLineNumber = "452"
+ endingLineNumber = "452"
landmarkName = "signAndEncrypt(_:keyIDs:)"
landmarkType = "7">
</BreakpointContent>
@@ -2574,11 +2574,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "428"
- endingLineNumber = "428"
+ startingLineNumber = "427"
+ endingLineNumber = "427"
landmarkName = "-toSignDataForType:inputData:key:keyPacket:userID:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2638,7 +2638,7 @@
moduleName = "enzevalos_iphone"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/ObjectivePGP.m"
- timestampString = "520546675.633841"
+ timestampString = "520595305.804012"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "731"
@@ -2653,7 +2653,7 @@
moduleName = "enzevalos_iphone"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/ObjectivePGP.m"
- timestampString = "520546675.63525"
+ timestampString = "520595305.805264"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "731"
@@ -2778,11 +2778,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583732.919957"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "44"
- endingLineNumber = "44"
+ startingLineNumber = "75"
+ endingLineNumber = "75"
landmarkName = "generateKey(adr:)"
landmarkType = "7">
</BreakpointContent>
@@ -2794,11 +2794,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/netpgp/lib/netpgp.c"
- timestampString = "520544298.962395"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1300"
- endingLineNumber = "1300"
+ startingLineNumber = "1302"
+ endingLineNumber = "1302"
landmarkName = "netpgp_generate_key_rich()"
landmarkType = "9">
</BreakpointContent>
@@ -2815,8 +2815,8 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "525"
endingLineNumber = "525"
- landmarkName = "-generateKey:named:toDirectory:saveToDefaultKeyring:"
- landmarkType = "7">
+ landmarkName = "@implementation UNNetPGP"
+ landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@@ -2858,11 +2858,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPSignaturePacket.m"
- timestampString = "520533800.022032"
+ timestampString = "520595304.503157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "354"
- endingLineNumber = "354"
+ startingLineNumber = "353"
+ endingLineNumber = "353"
landmarkName = "-signData:secretKey:passphrase:userID:error:"
landmarkType = "7">
</BreakpointContent>
@@ -2938,11 +2938,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "517"
- endingLineNumber = "517"
+ startingLineNumber = "488"
+ endingLineNumber = "488"
landmarkName = "signAndEncrypt(_:mailaddresses:)"
landmarkType = "7">
</BreakpointContent>
@@ -2950,15 +2950,15 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "483"
- endingLineNumber = "483"
+ startingLineNumber = "454"
+ endingLineNumber = "454"
landmarkName = "signAndEncrypt(_:keyIDs:)"
landmarkType = "7">
</BreakpointContent>
@@ -2970,11 +2970,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "476"
- endingLineNumber = "476"
+ startingLineNumber = "447"
+ endingLineNumber = "447"
landmarkName = "signAndEncrypt(_:keyIDs:)"
landmarkType = "7">
</BreakpointContent>
@@ -2986,11 +2986,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583691.078219"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "536"
- endingLineNumber = "536"
+ startingLineNumber = "507"
+ endingLineNumber = "507"
landmarkName = "addKey(_:forMailAddresses:discoveryMailUID:)"
landmarkType = "7">
</BreakpointContent>
@@ -3014,7 +3014,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/ObjectivePGP.m"
@@ -3046,7 +3046,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/PGPKey.m"
@@ -3059,14 +3059,14 @@
landmarkType = "7">
<Locations>
<Location
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[PGPKey signingKeyPacket]"
moduleName = "enzevalos_iphone"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/PGPKey.m"
- timestampString = "520546675.665074"
+ timestampString = "520595023.227005"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "224"
@@ -3074,14 +3074,14 @@
offsetFromSymbolStart = "42">
</Location>
<Location
- shouldBeEnabled = "Yes"
+ shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[PGPKey signingKeyPacket]"
moduleName = "enzevalos_iphone"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/Olli/enzevalos/enzevalos_iphone/PGPKey.m"
- timestampString = "520546675.666404"
+ timestampString = "520595023.228871"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "224"
@@ -3194,11 +3194,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/netpgp/lib/netpgp.c"
- timestampString = "520544298.962395"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1309"
- endingLineNumber = "1309"
+ startingLineNumber = "1311"
+ endingLineNumber = "1311"
landmarkName = "netpgp_generate_key_rich()"
landmarkType = "9">
</BreakpointContent>
@@ -3210,11 +3210,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/netpgp/lib/netpgp.c"
- timestampString = "520544298.962395"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1310"
- endingLineNumber = "1310"
+ startingLineNumber = "1312"
+ endingLineNumber = "1312"
landmarkName = "netpgp_generate_key_rich()"
landmarkType = "9">
</BreakpointContent>
@@ -3226,11 +3226,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/netpgp/lib/netpgp.c"
- timestampString = "520544298.962395"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "1271"
- endingLineNumber = "1271"
+ startingLineNumber = "1273"
+ endingLineNumber = "1273"
landmarkName = "netpgp_generate_key_rich()"
landmarkType = "9">
</BreakpointContent>
@@ -3258,11 +3258,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../enzevalos_iphone/enzevalos_iphone/PGPEncryption.swift"
- timestampString = "520583732.919957"
+ timestampString = "520595021.659349"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "45"
- endingLineNumber = "45"
+ startingLineNumber = "77"
+ endingLineNumber = "77"
landmarkName = "generateKey(adr:)"
landmarkType = "7">
</BreakpointContent>
@@ -3471,7 +3471,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1094"
endingLineNumber = "1094"
- landmarkName = "netpgp_export_private_key()"
+ landmarkName = "netpgp_import_key()"
landmarkType = "9">
</BreakpointContent>
</BreakpointProxy>
@@ -3519,7 +3519,7 @@
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1090"
endingLineNumber = "1090"
- landmarkName = "netpgp_export_private_key()"
+ landmarkName = "netpgp_import_key()"
landmarkType = "9">
</BreakpointContent>
</BreakpointProxy>