From e6baac53ae6a238a84ae829c30459c17cbffac88 Mon Sep 17 00:00:00 2001 From: Dirk Zimmermann Date: Mon, 15 Feb 2016 14:42:34 +0100 Subject: [PATCH] mutt email test finetuning also added missing files --- iOSTests/A3FC7F0A.asc | 29 +++++++++++++ iOSTests/A3FC7F0A_sec.asc | 56 +++++++++++++++++++++++++ iOSTests/account_A3FC7F0A.ser | Bin 0 -> 475 bytes iOSTests/iOSTests.m | 8 ++-- iOSTests/msg_to_A3FC7F0A_from_mutt.ser | Bin 0 -> 3119 bytes 5 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 iOSTests/A3FC7F0A.asc create mode 100644 iOSTests/A3FC7F0A_sec.asc create mode 100644 iOSTests/account_A3FC7F0A.ser create mode 100644 iOSTests/msg_to_A3FC7F0A_from_mutt.ser diff --git a/iOSTests/A3FC7F0A.asc b/iOSTests/A3FC7F0A.asc new file mode 100644 index 00000000..8ce89cfe --- /dev/null +++ b/iOSTests/A3FC7F0A.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG/MacGPG2 v2 + +mQINBFbBrFwBEADl0iNXgdduRcEzCcZx6qx98phzKL4BuACuPKQPcEfrKEK3CVjQ +GSCrUKJ8C8J3t+G1qNyyCalyJiU9jmSzq1Wh+cDNPpOLxRaZ3L5rcsVJz6VaRYUA +o2L9sZOCk5vVd7d6conlKYPGhHBbt3yWtMKRtBjgjOlAfVLEd3j2BxwCWS9QQcnr +7YwPLAgy8XbMEkK/F3t3XPdaJUrKD2xJAN+CFOzVjNIooq8Efln/dBQKjurgC2TA +3cDpfKwXMkh31Hgto0UEhnp1lsvFhmXznKu1JZu/1hw2F7LtuhEZkeHFyhkO3zIA +1LuiInYVXtsVD4IY54IYo63BDc6BdD8srPzD8EO59LZ9bS0h3+4310XQi9fvsGJT +gxaHpNnVxfCsRHCntFPDt0oGuHcC6UP4F3eSwnvrE74zcyWoo4cFYnyvz0zfsIkH +22N329YJReh5apZE8qtYDsagVjZg4rqMJ4gKlHZlMOqcZVix7gQna9f7oZuDMk0N +O8cGEPGGULPCkwZJYD8fxG2/3qE7rTKCPquHtakdriuuuMksBuO9gy6EAhoGjLGY +dBajJq+UsaVIBpmBV8h/7fVqX40nsXK4NSGo6ru+h3ox12UOcvloqYrpNf8+t7S2 +LdqstJ3tF9RTHiegbairHbU4W0uLjKjv0gRxvFfmRbPdBTdOOwoIIKlmzwARAQAB +tB1UZXN0IDAwMSA8dGVzdDAwMUBwZXB0ZXN0LmNoPokCPQQTAQIAMQUCVsGsXAUJ +AeEzgAkQxVmGV6P8fwoCGQECGwYGCwkHAwIBBhUIAgkKCwMWAgMCHgEAAKPdD/9G +hX5iCL87aRisio0yqRqcc8gmUiPBEzFh3iDHJRGdWE4sd7U+ipuCKBkqfqYKtIrJ +pfVDu0Zooh9ZU9A+jAtnsSuMK4O6UO4H7u202xg1G8jXDYmCSry7I4P0O2dtl+d9 +ye56LGpyNdD65BpN662OUd5sxVQwnT/NgCTWvLjh4cEYoJgrpreKq2gPkDAhT3Ox +fR3lAVaWXFa+pHWsI8dU2BzkJAWc0vejeQZSF/LY3Qg5CKSt35EmKYxl5CTO68z3 +McPMu+ker7JKJHOQx7mUhYl08YDeloRLx2i/XIsnf7ZW5Mo6XPjSZIC9rgAsWBnr +AvOebPpELEQP75ZyJLHQwOTGO1UO+MF7ERGs9PzvP+f/IqKahv/0fth9NTNpZY8F +En4rDM0W3Xq48C2KLq01cu9UZP1T6RmhE2W3l5m+98ChGZ7QU/TlBmkOPVFCi958 +kK84tgJ3itlZTmxsgJSCnjIJ5EYCNtJlpjK6XxMKzGWutBAa4adr78M3s2p18ZUP +7y83qxM3d9KaUzvyXLgjZGqlIW/VHXonBeaacU+tN0en/0jhqCiW1vc9EZlS0SAa +krLAW3h6huCu2FOFYOzl/WpRHdAr5w1UMDLwQ6zhhgYnnk613jvrN0n4lenEDdFR +szj2ytimiWaZd1bX+qDqExWGidxgIu1z12ziXM+mog== +=l9Kk +-----END PGP PUBLIC KEY BLOCK----- diff --git a/iOSTests/A3FC7F0A_sec.asc b/iOSTests/A3FC7F0A_sec.asc new file mode 100644 index 00000000..6fd9992c --- /dev/null +++ b/iOSTests/A3FC7F0A_sec.asc @@ -0,0 +1,56 @@ +-----BEGIN PGP PRIVATE KEY BLOCK----- +Version: GnuPG/MacGPG2 v2 + +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 +polmmXdW1/qg6hMVhoncYCLtc9ds4lzPpqI= +=r9ug +-----END PGP PRIVATE KEY BLOCK----- diff --git a/iOSTests/account_A3FC7F0A.ser b/iOSTests/account_A3FC7F0A.ser new file mode 100644 index 0000000000000000000000000000000000000000..afc8968e86783073623c68bcf98bf8a4f8bc61bf GIT binary patch literal 475 zcmYc)$jK}&F)+Bo$i&RT%Au+jqEeDy5TTNvl$DxXQXHXDmReMtnV%P_l30|SkqP8o zWMdCfF=$|1$;l-yAt@y-BO9ucSDKS^nVW}~Pe?e*FIW$%IZP!vC$YFV94L~VT3Ni9 zUqG;dwSldHy@6w~h^SZtQv-7YOGIgLYEfQdZfba9N=i{GP&r5-J~JgEB(=Ci!N9;U zUO=b>$ON(+3Q`L|OugiccmbOV-Q@hD)Re@ML@RxL7Xu?FOEU`-T}yLAXI&F#S0`Od zCrd+JOEVK=12+>V3rkm5eaGbF{L;J<{Q|>Fa`Fl)5fJyK7DquCAXh9_R8o!?5cUi9 zEiFk*%1L#}OfCU>Ke4DX#xEGbiSP^d2Zs=LwL%PxZ42TB`2B*tQ!7(b9HBwSz`-EM zAjTlipuu3oV9H>@V8!6V;KdNg5W|qnkj;?KP{>fsP|8rwP|Z-wP|wiF(8Vx`VHU$; oh8+yw8U8S`G72z?FlsTHGdeJaF-9|h0TUyHW>AOHP>L}Z07kik%>V!Z literal 0 HcmV?d00001 diff --git a/iOSTests/iOSTests.m b/iOSTests/iOSTests.m index f5863d95..e9305a89 100644 --- a/iOSTests/iOSTests.m +++ b/iOSTests/iOSTests.m @@ -653,8 +653,10 @@ PEPSession *session; // This is the secret key for test001@peptest.ch [self importBundledKey:@"A3FC7F0A_sec.asc"]; - // Mail from outlook, already processed into message dict by the app. + // Mail from mutt, already processed into message dict by the app. NSMutableDictionary *msgDict = [self unarchiveDictionary:@"msg_to_A3FC7F0A_from_mutt.ser"].mutableCopy; + [msgDict removeObjectForKey:kPepLongMessage]; + [msgDict removeObjectForKey:kPepLongMessageFormatted]; // Also extracted "live" from the app. NSMutableDictionary *accountDict = [self unarchiveDictionary:@"account_A3FC7F0A.ser"].mutableCopy; @@ -666,8 +668,8 @@ PEPSession *session; NSArray* keys; NSMutableDictionary *pepDecryptedMail; - PEP_color color = [session decryptMessage:msgDict dest:&pepDecryptedMail keys:&keys]; - XCTAssertEqual(color, PEP_rating_reliable); + [session decryptMessage:msgDict dest:&pepDecryptedMail keys:&keys]; + XCTAssertNotNil(pepDecryptedMail[kPepLongMessage]); [self pEpCleanUp]; } diff --git a/iOSTests/msg_to_A3FC7F0A_from_mutt.ser b/iOSTests/msg_to_A3FC7F0A_from_mutt.ser new file mode 100644 index 0000000000000000000000000000000000000000..9242ca51f5d41c3c837d646cddcbc54e724dd304 GIT binary patch literal 3119 zcmcImTa4q>8MZeLEZz;wUbrr>VHvK&jO|>VVRyl~UpyI1a6UBhr96gz(3{Zz8BQLUYL;N*jw;y|6w-1%cqKK1o) zeCNC0KfU#X*WYL?YmTCPxMy$R${P-KXm;(wG0kOO=~`CH(~LydI(ya9zWoOdUVY8A z*If?+;A(IUxE9<5ZU*;&Rj>vyfP)*)-gwi^hl95qxpn!r+rcj20|@Yg%fRJeH@E_z zU=P^K*!t$uK1J6g)si;*x~X<;TNF5JpqsX*s`pJ@?U-U;G)0XUtrOmImmjF2W?O8J z=Q-W6C0*8}6SB5xiiYBD+Is7PKZfVe?cEcOfP=3_!Ig`Q;_LUGAroL9*bfezIeH9S z1(rC+5>2hEimk37n4)EIbHRVr5=q}hsNcYBIRnP%7Zs=7VzSpCQP=05o3 zQ9+&rE!$PZV@C`xSTF05{8=5WKiYVL@ zBtpTS>m`2P?H70WzgS!d!n^ymuEl#Xtc8N52MCU<6(7Pt%C4OT8LftTw`k8bQkK3rXlWF}Xj zgVkI$Sjn&~mCI~v187QD7c{gU%vE!BU01B&YH(oNhUMM3WJvZxwWga=01cpnTA@Ob z&CWm(hghC0Q8f%>^BbCAhx?YM=&A4^;f~z-bS&q%j%r#(Im&I!%Y-Qt6w`Ub+SQb$aJG0?Q4ds@BuXK zv=iCEtQVWlREpMws7RMWLn)zVxW=qhtJd)muXkP9Ao_{!e9%ppq>kt5X`7_WN^>p* zP_a8M#pVht=7*Im-NN#iZ&V!s@UCwL|_4C%Nk6e+sY=%&tqrR(u4lC}X{Y-*k*Z|s z<2;rj18BTkE|E>zsZ-2s=GtSUns?$wV-~0C=|Uoo_ZoATXCm=Rq2EX}=oYOp=}v0W z%4gGR#&x_(Iz%gFwya1s9G1yGYliJ=EyQ3HHi?BWXC*7rF|3{*Z6q@DrmhuA{fslk zD6u+ebv1@0+yI&^64iMh{G9%1dHK!L&Ig>)9SrJ)wY_+BAIGXfc zV=J1pqQz1tL)Vk-3`H%_H|mwxqN_2zh`M28x-yli;g~DC5lJ>%+O*8oF(scY#jSX{ z&dfFls^A({t{6{e1{C4lrW7&KT4&ZG!qG%)KCBk06*fL59WzOELZeDt;zcSQ#)nuo z6%Sh_$0!zC{d6g3xGAbL!`J{i&1I4TO>q&~4x1Hw(!=R))v;G%^F*7{nq-x#Vv$m{ z;_z+@qm$~i(_Xv_K<6<0hH_{!-Gs|gtf@B8_rUa+HwSGkZiClX~gDν@c z)UDSOMbi{!6($xXs$N+WY29d~Suuce`NnA4k9O$ns8>x%e8FjsGp67wF&P_$XXCVG zv2&tYY%>ZbbsKp(x6$UOndqR9a%y>1 z5QGWN)S6;dqU$L_n>U$Mt=V)ksdK!Upj8z8XiYU0^pwg9vc0te7R!S?K zvQ(^(2jixYm`@a3as=Fn(2*LR!{ZLiG4={cjsoZgU5k!-sb)Ks9yw7qB@bd`i!HkX zp>}5TX_@bZ47Y5uIn#(U?L?c23|CrOQ>oZ3W-z7_0hEnX9@8A_VR0^iZZlMdPJa$- zd2HgA$S?a zVG_ORFM{P0y&9nB3*<>Bt%9=h>DoV!^o4!)5!D4E68c&HRMg?9pqi)J>+BL z56EATzxsFiFZb{9-{imDkNGJ->+kp<^grb9`2~O9KlCep&2RV}w2aayi#AXLouQAS lkD~y60zHL3g+7gb8+{r59{LKp1#ORA@cG%R-X#Nl``<+9x