From da918a74d5f4e33cddfdd43e465d40d00d6604e0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 19 Mar 2015 12:43:04 -0400 Subject: [PATCH] gpg: Regenerate test data for test-gpg-verify-result Turns out the expired signature case was failing because the signature itself was corrupted. Reconstructed the test data and updated the test code. Note, an expired signature is still counted as valid. Also, handy debugging trick for setting a key or signature expiry: the CLI makes it appear the shortest expiry is 1 day, but it also secretly recognizes "seconds=N". --- tests/gpg-verify-data/lgpl2.sig | Bin 1441 -> 1441 bytes tests/gpg-verify-data/pubring.gpg | Bin 3982 -> 3974 bytes tests/gpg-verify-data/secring.gpg | Bin 7794 -> 7795 bytes tests/gpg-verify-data/trustdb.gpg | Bin 1440 -> 1520 bytes tests/test-gpg-verify-result.c | 31 +++--------------------------- 5 files changed, 3 insertions(+), 28 deletions(-) diff --git a/tests/gpg-verify-data/lgpl2.sig b/tests/gpg-verify-data/lgpl2.sig index a9eafbf760bdfdd373129d14880105e7a8972561..4229b814f7565fdef945d1f92e3123e95cd9f5df 100644 GIT binary patch literal 1441 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 diff --git a/tests/gpg-verify-data/pubring.gpg b/tests/gpg-verify-data/pubring.gpg index 187538f36d577778b1df8ce9273b2762037a5864..2c9e5b6a1a7b8af58353c293534ca5d92c601003 100644 GIT binary patch delta 2057 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 iWk{Mh$7WPmW$oo9T`G)4sY|h`FeasL5 delta 2057 zcmV+k2=@1eAC4ce6b26k0#yC30sP|A zK!yyxW0q&Qz9D)RskE=?+Ch)NBCKu-t<3xY@(O2&z!i{?{oZ+Pt<(8BOKgB{jS*eH{*Zu7JZBa4%f)_ zT~F{{6DNOTiwh{Suq7$+aCB2-F(&WfLwJHJS1Y!@r*;j!ac!tb30V!@k`k`B34>Om z$+CTs!;pj5{qY=t`+B}g0H449D?S9Yz3-2t{|{PWb9mVJ z=z*G^vpq8v=Nm+p_A9#Fn;d0cDuo@eB(A30#o7*rAI0YgO0lo#gcuAN+_Ovv9RYs@ z0#yC30s_}%mq7tVRD23X9E8U zHT&bO3k%d_G$9L-2rF!Vund;$|NdV;QoJGSKXv)<7#NCP?Aace6Fs zO+W+;@Y1w$wIyS3zq0QX>^V&nXs~}??LBoOsMk8G2Z~saR!k8y%HdnfIU-P+Lz24Q z`yln(TG)*u2&`2}#2)H$E{Jwmu!o3vS0m@Tgz9drHoAc>Freu>cTASByA#lw=IG}J z`fi7D)T(RG{0jcyH7|{7cQ7Ci4sQq_0+acAeNB)_WmUSLkS}nk$}rRCixz(;n9+*# zLEYvPVcE9;G{t+mg=kG+d(i9~z*>|Q6?CmxumS)BnE?$1RQ^gno`7Atw1H{OxB z43dS1_qm)K0Jy2c3Z%>kXFz|J4T8`#{ zG;(BqG%$?ohx8`f^T|N6Od7pe7B9QQ0krVUNRczH1mRhoS((NDjShdUT8xFE-qLal zcP@7rIe;g^(NHGw1p`JLJ2(n}en#ZNc^z6>ng`V!6DwMavaU$tA3$c$n4pK$c#Ndu%{J(p_C?Xnc5Yz9n8%?ig2lxHY93ko{F z<#w6~vLQ8jXK4O+o`49q2BybRP7LPv?*D}oX8r*l6S zCOieY<{-h0ORoiiFW(MS{5uwl+Dy(2FDl`ZZ;vcY?Pl9+@%N)H)Y4sZlQW<(I$X^~ zj|=M&RCMyS7!BvJS?@TVK~W*JHOHV5*4$)+7PH=ulKF=9VXCKS!~svEN^J}ct-p0u zm9PQ;1GG9yE+CWI3qk}`{ky1>APgXX5ns@9$i-ljN!17cco?V)N?EsLaREZc8KKqp zEo!=|p44Co39``dYyc?=>Js!46q_xJgj!+mnvEVCK*P{p%@@?_n=gnDOZP9EsdM~7 z<&9e`R=9jO5&HV~$Dh)<9KD-O5abO!>gJ4R$p;nO$dpAO28dt>>Q#zV$T07Jqb7?H z)PMC`O}rj^*|ygP*fgtg1MOv>PqJHv#%-|+N7Tm-bY<7Xj5AJxl1UocC=h#3;8W}y2H&|7kKCc{MHpTj|m1q6P( zc#1S5{jXuu!8^P6(#N?0T)5bOHY5MtQ5eL8upGY=Nn5Z200X%J4FpvEyQl#O0J2=G zIou_l%xL$s7l^CDd(g8-3A(n^X?KNt!a^fCc=SJOVa!xbuGjOjLDrRJHKW~_4rATt)Lbr>N;iq$HJ=t9YGGtLBnQtTo z!`>uz3Q3Kp5A}JbfuP-}6gmZP6SN&bg->KtGd7>TO(f(o47)dKo#jOfNplDI?57im z?p=z#m~$!8svf|eBQE-X9#5C?z>{`gf`u39r@&4ObjO>;lwAOMGVXX^nrXQJ5di=J zi2)x37y$wR2?YXF{ky0F8w>yn2@nxq&~nJdV3Uf!2mfoz!{QQf+ireI$pUJuW}+7D zwb++q*4SBpXOQ5H@|A{en*W}=xo_fTsBMCf|0fTnbzjdvpr)-*Wy%& zsIE9FgZ-Hy{}&&KlB9nTqS|955-3%(n5S%A=xkgc&~*-*6dacLBoYWc36Bcfo0l$Q z1XB3z7LhTuf<^IwDGFOx!m0Zi?nY0gr-XKQI-jA^{c<|o8F?qPtf-nyCVQ!qfZXNK zGkk!VA+^H$KEowUF#X{Sf;QkYpDd1|AdAEetg3ZkRM8zf452QQU%Zepm7QaMAuIC5 n4+)4h9xL7BtN{z^PkouGi(Hh&;`$Ied{L{jX9r!3umS)BS0TN! diff --git a/tests/gpg-verify-data/secring.gpg b/tests/gpg-verify-data/secring.gpg index 219df34467cfb0a3d87f5d8dfa9f2529da074ea9..38e7f1c1c572835e4437b33d93530b463fe9d500 100644 GIT binary patch delta 3122 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 L2VIP?0s;U4!OP+4 diff --git a/tests/gpg-verify-data/trustdb.gpg b/tests/gpg-verify-data/trustdb.gpg index b7426c719d08e6c5529190244360370babb2d7c1..3f046fad106df32b0a4d73339c21fbeeb034656f 100644 GIT binary patch delta 114 zcmZ3${efG6F})z2nVFH5k%@sJlf0DqHr_kL62QZtp&J_UN+@UhOo_}{ u&oeV;_th26VSoTtC=H}|8OnO6!zj0FG>!yHNg delta 34 qcmeysy?|SQF})z2nVFH5k%@sJresult); g_assert_cmpint (count_all, ==, 5); - g_assert_cmpint (count_valid, ==, 1); + g_assert_cmpint (count_valid, ==, 2); } static void @@ -125,7 +125,7 @@ test_signature_lookup (TestFixture *fixture, guint expected_signature_index = GPOINTER_TO_UINT (user_data); /* Lowercase letters to ensure OstreeGpgVerifyResult handles it. */ - const char *fingerprint = "20e10cfa61ca9cbedbfb03ad115fd072c8c56093"; + const char *fingerprint = "68dcc2db4bec5811c2573590bd9d2a44b7f541a6"; guint signature_index; gboolean signature_found; @@ -358,33 +358,8 @@ test_expired_signature (TestFixture *fixture, &key_revoked, &key_missing); - /* XXX GPGME seems to be mishandling this case entirely. - * - * GPG itself recognizes the last signature as expired: - * - * gpg: Signature made Tue 10 Mar 2015 06:29:07 PM EDT using - * RSA key ID 9A51B00B - * gpg: BAD signature from "J. Random User (valid signing key) - * " - * gpg: Signature expired Wed 11 Mar 2015 06:29:07 PM EDT - * - * But the gpgme_signature_t record comes back with: - * - * summary = GPGME_SIGSUM_RED (expected GPGME_SIGSUM_SIG_EXPIRED) - * status = GPG_ERR_BAD_SIGNATURE (expected GPG_ERR_SIG_EXPIRED) - * timestamp = 0 } - * exp_timestamp = 0 } all wrong values! - * pubkey_algo = 0 } - * hash_algo = GPGME_MD_NONE } - * - * Possibly a parsing error in GPGME? It acts like it sees the BAD - * token and just gives up on the rest. Worth investigating further? - */ - - g_assert_false (valid); -#if 0 + g_assert_true (valid); g_assert_true (sig_expired); -#endif g_assert_false (key_expired); g_assert_false (key_revoked); g_assert_false (key_missing);