From d5b18d6c55d65e8df2dd112651e3b9b3d9e6e27a Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@g10code.com>
Date: Tue, 6 Dec 2016 11:17:13 +0100
Subject: [PATCH] tests: Replace data used by the TOFU conflict test.

* tests/openpgp/tofu-2183839A-1.txt: Remove file.
* tests/openpgp/tofu-BC15C85A-1.txt: Remove file.
* tests/openpgp/tofu-EE37CF96-1.txt: Remove file.
* tests/openpgp/tofu-keys-secret.asc: Remove file.
* tests/openpgp/tofu-keys.asc: Remove file.
* tests/openpgp/tofu/conflicting/1C005AF3.gpg: New file.
* tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg: New file.
* tests/openpgp/tofu/conflicting/1C005AF3-1.txt: New file.
* tests/openpgp/tofu/conflicting/1C005AF3-2.txt: New file.
* tests/openpgp/tofu/conflicting/1C005AF3-3.txt: New file.
* tests/openpgp/tofu/conflicting/1C005AF3-4.txt: New file.
* tests/openpgp/tofu/conflicting/1C005AF3-5.txt: New file.
* tests/openpgp/tofu/conflicting/B662E42F.gpg: New file.
* tests/openpgp/tofu/conflicting/B662E42F-secret.gpg: New file.
* tests/openpgp/tofu/conflicting/B662E42F-1.txt: New file.
* tests/openpgp/tofu/conflicting/B662E42F-2.txt: New file.
* tests/openpgp/tofu/conflicting/B662E42F-3.txt: New file.
* tests/openpgp/tofu/conflicting/B662E42F-4.txt: New file.
* tests/openpgp/tofu/conflicting/B662E42F-5.txt: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B.gpg: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B-1.txt: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B-2.txt: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B-3.txt: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B-4.txt: New file.
* tests/openpgp/tofu/conflicting/BE04EB2B-5.txt: New file.
* tests/openpgp/tofu/conflicting/README: New file.
* tests/openpgp/tofu.scm: Update accordingly.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>

There are two motivations for this change.  First, we decided that
test data should live in a subdirectory rather than in tests/openpgp.
Second, secret key material is password protected, and I don't
remember the password that I used.  (The new data is not password
protected.)  I have also added some new examples of signed messages.
---
 tests/openpgp/tofu-2183839A-1.txt             | Bin 191 -> 0 bytes
 tests/openpgp/tofu-BC15C85A-1.txt             |   9 --
 tests/openpgp/tofu-EE37CF96-1.txt             |   9 --
 tests/openpgp/tofu-keys-secret.asc            |  95 ------------------
 tests/openpgp/tofu-keys.asc                   |  47 ---------
 tests/openpgp/tofu.scm                        |  62 ++++++------
 tests/openpgp/tofu/conflicting/1C005AF3-1.txt | Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-2.txt | Bin 0 -> 338 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-3.txt | Bin 0 -> 339 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-4.txt | Bin 0 -> 338 bytes
 tests/openpgp/tofu/conflicting/1C005AF3-5.txt | Bin 0 -> 339 bytes
 .../tofu/conflicting/1C005AF3-secret.gpg      | Bin 0 -> 2537 bytes
 tests/openpgp/tofu/conflicting/1C005AF3.gpg   | Bin 0 -> 1235 bytes
 tests/openpgp/tofu/conflicting/B662E42F-1.txt | Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/B662E42F-2.txt | Bin 0 -> 339 bytes
 tests/openpgp/tofu/conflicting/B662E42F-3.txt | Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/B662E42F-4.txt | Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/B662E42F-5.txt |   1 +
 .../tofu/conflicting/B662E42F-secret.gpg      | Bin 0 -> 2537 bytes
 tests/openpgp/tofu/conflicting/B662E42F.gpg   | Bin 0 -> 1235 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-1.txt | Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-2.txt | Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-3.txt | Bin 0 -> 340 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-4.txt | Bin 0 -> 342 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B-5.txt | Bin 0 -> 340 bytes
 .../tofu/conflicting/BE04EB2B-secret.gpg      | Bin 0 -> 2537 bytes
 tests/openpgp/tofu/conflicting/BE04EB2B.gpg   | Bin 0 -> 1235 bytes
 tests/openpgp/tofu/conflicting/README         |   8 ++
 28 files changed, 40 insertions(+), 191 deletions(-)
 delete mode 100644 tests/openpgp/tofu-2183839A-1.txt
 delete mode 100644 tests/openpgp/tofu-BC15C85A-1.txt
 delete mode 100644 tests/openpgp/tofu-EE37CF96-1.txt
 delete mode 100755 tests/openpgp/tofu-keys-secret.asc
 delete mode 100755 tests/openpgp/tofu-keys.asc
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3-1.txt
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3-2.txt
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3-3.txt
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3-4.txt
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3-5.txt
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg
 create mode 100644 tests/openpgp/tofu/conflicting/1C005AF3.gpg
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F-1.txt
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F-2.txt
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F-3.txt
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F-4.txt
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F-5.txt
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F-secret.gpg
 create mode 100644 tests/openpgp/tofu/conflicting/B662E42F.gpg
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B-1.txt
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B-2.txt
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B-3.txt
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B-4.txt
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B-5.txt
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg
 create mode 100644 tests/openpgp/tofu/conflicting/BE04EB2B.gpg
 create mode 100644 tests/openpgp/tofu/conflicting/README

diff --git a/tests/openpgp/tofu-2183839A-1.txt b/tests/openpgp/tofu-2183839A-1.txt
deleted file mode 100644
index 521b3bba426ad2d7d53eacee34d561db60dc2b01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmV;w06_nv0h_?f%)r5D6E!hjvAKB`<7wU`hR{Dk`Dyw2Nr^>V9dlS17&#c&SeZbA
z3|yQ7FqN9>%>S%xYs-}`eS0Fh`ty}2!-W$yf@F^`jkvLR`P{^~{xu7aCb{o5D%3r)
zpX+1|ONtur$-s5#>zf`FM#OB{Be~~XbKU{<Ra;VY=2Xn6h){pJxX#1W@SRL7S2x=f
t)@A&k&$AzT=Ixu~P@(Q>Re#rmH_&m?uAfWv_Z(*Li?UbuSfJs>0|2ceWvu`J

diff --git a/tests/openpgp/tofu-BC15C85A-1.txt b/tests/openpgp/tofu-BC15C85A-1.txt
deleted file mode 100644
index 88cc64935..000000000
--- a/tests/openpgp/tofu-BC15C85A-1.txt
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-owGbwMvMwMF46tzNaXtET0QxnmZPYgj9/c+Sq2MOCwMjBwMbKxOIy8DFKQBTo/SK
-hWFThVuj19r3R/6VzQkpaZuQx7s3r9BQ46v8KXkjb58dSjmXyr7enlCzb7dg1zE7
-aynbc6YTF+wXZI4IlAgPuLJhUeSXo0+WllxbFXUz39407cv15TcXThLj+3tFkSnZ
-YFXwM9+nfAoHpt6I/ZY96SJT3XFZKzO1jeZNJhZsV4Vfrjp0UmnH3E4A
-=X9WM
------END PGP MESSAGE-----
diff --git a/tests/openpgp/tofu-EE37CF96-1.txt b/tests/openpgp/tofu-EE37CF96-1.txt
deleted file mode 100644
index 33a38db2c..000000000
--- a/tests/openpgp/tofu-EE37CF96-1.txt
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2
-
-owGbwMvMwMEY0Tqz9J35+WmMp9mTGEJ//xPk6pjDwsDIwcDGygTiMnBxCsDULFZm
-/sk4S36iQ6FuZZPMPdOSe/rZOxNThTmzvJN4l1qe9XGdlLhtpumfzh0uhRnzT2Xc
-jmra+ZdN9+XBhml//i7v6XrfuWu56OuEI/fXH0i3P5HELb+j++6SO85VemLq/tvO
-hNvWtddvuZ7+z2JJaqnP4wiu2t+sEze/MWKZ9zz+u2FV6a3OIyJxjwA=
-=JMtb
------END PGP MESSAGE-----
diff --git a/tests/openpgp/tofu-keys-secret.asc b/tests/openpgp/tofu-keys-secret.asc
deleted file mode 100755
index 68e0d201c..000000000
--- a/tests/openpgp/tofu-keys-secret.asc
+++ /dev/null
@@ -1,95 +0,0 @@
------BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v2
-
-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
-CQ==
-=2SlE
------END PGP PRIVATE KEY BLOCK-----
diff --git a/tests/openpgp/tofu-keys.asc b/tests/openpgp/tofu-keys.asc
deleted file mode 100755
index 2de1cf792..000000000
--- a/tests/openpgp/tofu-keys.asc
+++ /dev/null
@@ -1,47 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-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
-0v2sv67Ar70GR4vQwMvfCUAbnsVrL05eBjUJ
-=Btw1
------END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm
index e1fa00191..c4330850e 100755
--- a/tests/openpgp/tofu.scm
+++ b/tests/openpgp/tofu.scm
@@ -22,7 +22,7 @@
 
 ;; Redefine GPG without --always-trust and a fixed time.
 (define GPG `(,(tool 'gpg) --no-permission-warning
-	      --faked-system-time=1466684990))
+	      --faked-system-time=1480943782))
 (define GNUPGHOME (getenv "GNUPGHOME"))
 (if (string=? "" GNUPGHOME)
     (error "GNUPGHOME not set"))
@@ -30,13 +30,13 @@
 (catch (skip "Tofu not supported")
        (call-check `(,@GPG --trust-model=tofu --list-config)))
 
-(define KEYS '("2183839A" "BC15C85A" "EE37CF96"))
+(define KEYS '("1C005AF3" "BE04EB2B" "B662E42F"))
 
 ;; Import the test keys.
-(call-check `(,@GPG --import ,(in-srcdir "tofu-keys.asc")))
-
-;; Make sure the keys are imported.
 (for-each (lambda (keyid)
+            (call-check `(,@GPG --import
+                                ,(in-srcdir "tofu/conflicting/"
+                                            (string-append keyid ".gpg"))))
 	    (catch (error "Missing key" keyid)
 		   (call-check `(,@GPG --list-keys ,keyid))))
 	  KEYS)
@@ -104,18 +104,18 @@
 ;; Verify a message.  There should be no conflict and the trust
 ;; policy should be set to auto.
 (call-check `(,@GPG --trust-model=tofu
-		    --verify ,(in-srcdir "tofu-2183839A-1.txt")))
+		    --verify ,(in-srcdir "tofu/conflicting/1C005AF3-1.txt")))
 
-(checkpolicy "2183839A" "auto")
+(checkpolicy "1C005AF3" "auto")
 ;; Check default trust.
-(checktrust "2183839A" "m")
+(checktrust "1C005AF3" "m")
 
 ;; Trust should be derived lazily.  Thus, if the policy is set to
 ;; auto and we change --tofu-default-policy, then the trust should
 ;; change as well.  Try it.
-(checktrust "2183839A" "f" '--tofu-default-policy=good)
-(checktrust "2183839A" "-" '--tofu-default-policy=unknown)
-(checktrust "2183839A" "n" '--tofu-default-policy=bad)
+(checktrust "1C005AF3" "f" '--tofu-default-policy=good)
+(checktrust "1C005AF3" "-" '--tofu-default-policy=unknown)
+(checktrust "1C005AF3" "n" '--tofu-default-policy=bad)
 
 ;; Change the policy to something other than auto and make sure the
 ;; policy and the trust are correct.
@@ -127,42 +127,42 @@
 	   ((string=? "good" policy) "f")
 	   ((string=? "unknown" policy) "-")
 	   (else "n"))))
-     (setpolicy "2183839A" policy)
+     (setpolicy "1C005AF3" policy)
 
      ;; Since we have a fixed policy, the trust level shouldn't
      ;; change if we change the default policy.
      (for-each-p
       ""
       (lambda (default-policy)
-	(checkpolicy "2183839A" policy
+	(checkpolicy "1C005AF3" policy
 		     '--tofu-default-policy default-policy)
-	(checktrust "2183839A" expected-trust
+	(checktrust "1C005AF3" expected-trust
 		    '--tofu-default-policy default-policy))
       '("auto" "good" "unknown" "bad" "ask"))))
  '("good" "unknown" "bad"))
 
-;; At the end, 2183839A's policy should be bad.
-(checkpolicy "2183839A" "bad")
+;; At the end, 1C005AF3's policy should be bad.
+(checkpolicy "1C005AF3" "bad")
 
-;; BC15C85A and 2183839A conflict.  A policy setting of "auto"
-;; (BC15C85A's state) will result in an effective policy of ask.  But,
+;; 1C005AF3 and BE04EB2B conflict.  A policy setting of "auto"
+;; (BE04EB2B's state) will result in an effective policy of ask.  But,
 ;; a policy setting of "bad" will result in an effective policy of
 ;; bad.
-(setpolicy "BC15C85A" "auto")
-(checkpolicy "BC15C85A" "ask")
-(checkpolicy "2183839A" "bad")
+(setpolicy "BE04EB2B" "auto")
+(checkpolicy "BE04EB2B" "ask")
+(checkpolicy "1C005AF3" "bad")
 
-;; EE37CF96, 2183839A, and BC15C85A conflict.  We change BC15C85A's
-;; policy to auto and leave 2183839A's policy at bad.  This conflict
-;; should cause BC15C85A's policy to be changed to ask (since it is
-;; auto), but not affect 2183839A's policy.
-(setpolicy "BC15C85A" "auto")
-(checkpolicy "BC15C85A" "ask")
+;; 1C005AF3, B662E42F, and BE04EB2B conflict.  We change BE04EB2B's
+;; policy to auto and leave 1C005AF3's policy at bad.  This conflict
+;; should cause BE04EB2B's effective policy to be ask (since it is
+;; auto), but not affect 1C005AF3's policy.
+(setpolicy "BE04EB2B" "auto")
+(checkpolicy "BE04EB2B" "ask")
 (call-check `(,@GPG --trust-model=tofu
-		    --verify ,(in-srcdir "tofu-EE37CF96-1.txt")))
-(checkpolicy "BC15C85A" "ask")
-(checkpolicy "2183839A" "bad")
-(checkpolicy "EE37CF96" "ask")
+		    --verify ,(in-srcdir "tofu/conflicting/B662E42F-1.txt")))
+(checkpolicy "BE04EB2B" "ask")
+(checkpolicy "1C005AF3" "bad")
+(checkpolicy "B662E42F" "ask")
 
 
 
diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-1.txt b/tests/openpgp/tofu/conflicting/1C005AF3-1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dba581dec9513b4f1ad675f8fb324edc7dffeaad
GIT binary patch
literal 342
zcmV-c0jd6@0Rc||u>Oz@0{{pC%#AYh8~|GL0m}$t09Zw40Wk`R0W$;u0SEvc79j){
z1YTd*S1o)*s%_59jWY8b09x|}0$4?60RRdK5X_A-^Be$L^F_!A0D!{^7;x}{8c~wn
z%dQ?`{q;0w6a%exWpDU+isWPSR<*%aWnt_&EwO9z4N(N|(0ebe&ybq1`4LrkD3Oc&
zdRHnwDv74qV0A+J8BmD(qTu^`>)E&^W-Us-uTbo&wgnahY&XWh&mvl#SGQ+UWx2EP
zuhk}}<hLX~WJ+BM;?JZyCX{^D|FG6Wo**j{+W<NkFSSm*$^H5tGS+niv4yD4lN*rn
z<E>vrLlmv1R$auG7M4rg4Cv}CT;e@2!-Wo&kjCzan+;=W?sWkV_Q&96t@_9vl;s#a
o)|gy!qKRgqRyc|G78ly9up>4w;b`_x+rLtnHFcTBVI2^ZMN;USCIA2c

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-2.txt b/tests/openpgp/tofu/conflicting/1C005AF3-2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fde9fb882e82515a4e9145258cf6e38c65fc8d42
GIT binary patch
literal 338
zcmV-Y0j>U{0h_?f%)r5Trq}4R3`5js#?u^03=ytr>_%LjjK(Ysj2sNIVu~zcEOGHS
z!gXt0R^^_9DP?5>sbk>c6o84SIkNwi*m`xHe^zs?>|}>$6Gb{7L^_nqr$^6eHZ**m
zb3%|&X-)EMeI<pq1qr=Vb$X4Pg)J_v=`o9*e$KD?*nTB}z4PKuS*%LStDUxCMQUV(
zi^X%-Kra43wq~xdz6<-e9X|B+vRL9$^)D|b1-cxV+8d%6@1Db{-Q;C^?3Ig5N>F=_
zL8~IK^s2)tJI>55wf=PD%WUy$(=T^0OniF1CgoR~`+kf0_cWh8d_1Szt^U^C4e3&n
z!Smycg6H&gdj@EKSUjz{w?4aX--YxC_n)<978e+D?sL22U-0-HtEcd;3lU|v?dEjd
k*rjx`V!MI*VO|Ss_G2GyWF@uU2g+HexlT<u=;zJ~0Fkq?ssI20

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-3.txt b/tests/openpgp/tofu/conflicting/1C005AF3-3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e6aa4ac836480bb57303623f026b0cdaa38d66c8
GIT binary patch
literal 339
zcmV-Z0j&O`0h_?f%)r5Trq}4R3`5js#?u^03=ytryvAIejK(Ysj2sNIVu~zcEOGHS
z!gXt0R^^_9DP?5>sbk>c6o83Xq;oKA()l83xzt?UN6k;V;QbZO?N`pXURGie-o5og
zL-C1z)wf$Yj+>^6>v)9x`OXsTJag902Yt$S5>pQ@HQNwcqFy#5w$^b+a$&>!)0dRH
zmPHs`ky^;kVal-NQycTzm~Vo0$&GhTvgYqJ*uG<jQTXPnDRXj}C-iQe$FY7<*;C2J
z_Puw-<WkI*-(_B+s`9Y?E!Vn|_`gMq>jYij$X~JMU@7w#X3tut8ERzo?i~9gKV8G*
z#b@h1WZSP?VZD8cHBL0}#`inRA5A&C#Vh>8yjPlQyEE(5c1$wjkKT51y2Q-WA1#Ai
lCt3#_d$%<4HnVKu6ko^dB0t>}g?6TYNisRO{n4WpY5<zAwZs4b

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-4.txt b/tests/openpgp/tofu/conflicting/1C005AF3-4.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6a148916234adbd9c4faa04c8fb258bb0d4d9188
GIT binary patch
literal 338
zcmV-Y0j>U{0h_?f%)r5Trq}4R3`5js#?u^03=ytr!X{jujK(Ysj2sNIVu~zcEOGHS
z!gXt0R^^_9DP?5>sbk>c6o82+?_>X;`>?>ze&N1NU(PP;I;S(UUi6MywwCgT2W7eL
zp&@35j|u`!S7vO!tCDw;;j_s5&5eim)~-=9owwuj63uqQ)4H;uQNH)Tv%X0XTwc7Z
zU3Qweg!sNy!Crx;jV-n;&YS#-9y)ua{!Qzs=i!;8{AXvs-jRvvU6JcIsZ2JQeBk5U
z){qI!b23iP67`YDwUmAJv&E59U7wHF)q+=ER4$40wM2wiqUiF_SDj+^$rqL}pJ94F
zX^G%!H&$oy^Vhv18s@0jbZibjX;-}Rp|hRUqS$rema|wR+?LH$eBT~3U-866o-Z53
kYn(1ES?l`Qu*_svSq5`bWU*iH!`zK_2^YStw7IYZ03a>7LI3~&

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-5.txt b/tests/openpgp/tofu/conflicting/1C005AF3-5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..12fb5fb50305b861d49d5a0d48384d6dde892fdd
GIT binary patch
literal 339
zcmV-Z0j&O`0h_?f%)r5Trq}4R3`5js#?u^03=ytrlBQgpjK(Ysj2sNIVu~zcEOGHS
z!gXt0R^^_9DP?5>sbk>c6o84W^5tMy=W{v4N2&2)<>P}d0)#d#kcub{^{_TknYQ$i
z_Q@4tI~3Al&CWLMzpS%OiYqT{x1E_g!}Ci^&c-z4O6^{`=w?pIX5kjoCU%yi3SATL
z_eY(#`q#T_ia_IBIrhA8{m#p?_qN-wd1S?-6L(I`e`>D7tGCi_Z_hQ|)zDq>wPeN=
zxyZixrjw6;l{1=Pq3cq;X~P`Nc}Y%uzu6Kt=7|3*u3F$$sXpU)i}y>9;3JwlzigSx
z`LSoyyhNGj3TBpkhmXci+8F*a()0P22fLZJZeiiB_NkiP7Zvb2L8d}JFY+Q^OwR99
ln(Rf|Pm*2oEImH2-R<(-Fi-fpFnfpJ4)?{AZCt8X0|2R4xT^pF

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg b/tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..5f1e78ad10ad3c5e3c7b0eb160e27ef5cf5aa930
GIT binary patch
literal 2537
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

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/1C005AF3.gpg b/tests/openpgp/tofu/conflicting/1C005AF3.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..7a750111d33be01b86368aa821f8fd3c75c1a2c3
GIT binary patch
literal 1235
zcmbQq$jcJp8m7$1!Ejta)N7OA>dR59Z>O+*3QJgNvBvU7bD?(ygEZ$EE1`1DwE=2M
zH^ry^o_OjipP^6Jx%I;7t7o(s1-fx&I>+ee|IDZnaM$0v@x=X8sZw4xCE4@lKEHEf
zvZ<ut9A=sSe|P_`|9*V^t&o6gW{>plR<-r0ybvyF$qmldTJ002>m-&Vc--aBlUkj_
zZpPD9+`ekXOndCha5tm--qj=Lw@PfeaCgdUl{<&0*<{Q(sJMO=^F3Y1{RfUD<v+b~
z{5mIhQ=gZL%Wt7iha~O(pDs}TcJkv9#lDOEvE_G)4Na9w{o)(#BR1U4wsV-LGsDZA
z+vBv#kI;^!KN~$t=Jh0W`Pod{zF3?=kdc9Li@H~ScB+C~Vsc4-QKf=S7Lccx2H`oR
zRwU*Y<fQ5)=jYmWGWxLy14GS1Op!&5B`*F(xNeQhs@!vDdW}BIFhqT3Wda2&lQc6c
zHzx->6PqXpCl@ypix?9#Ba<8>lXwFI7pDMB@!={ChOPxCZO_f@y)Hk=p!DD7)4VJE
zR2MH^X5g}qwW=)gp5spDBVMHeyPOU8$9#PC)lKkNjkL{FdnG2hX)iKAmf5&27tOUi
z>-KzBon`Vn>1MfxU4gSX@4mg4+Pdgj;d}MRQfGVG&lr4-^EoN=ebdi|)8d-pe`_iu
zwth|R7TLUVkL`pfOFr*3U1fJdAS>g=l8a^bnhf%HrA_Alp7o(w?5*sdMVo);d0(BF
zv#Zl7bV-rvPJf#v@z<B~>e+j;<z1{Qiz(<|xA!D_xYTZ`Sqlr-+dRJh{l|39t=C2O
zyj_qbc`m0uXZJ4IUiInP7IBpUnk#4BQh&{RYL|YCo2qTi`LnM2LD9E&B2wbkO*3L1
z{CuG_`^z)gbIYA|IV$}n!d|9H_#fi#WxxGZqcY>|!s!OfT2}OA+z2YU=i7NV`cG=K
z+UN6`>1yTknD%Pxgq(k_oTKA=Bk|rJsXytnD-O)G*9pGtIrX*AIh(Y8?n0#;Y1SvF
z^*(Oi)sx}*dCmF7yDlm9pV7~lwA!i2YVEb-+*;;){q@C^1s^`#V7$)szvllp;!c;v
zWkgJO|5CP3wwog+l=z*?&NTS@k(md-FDmTS{1b8A+jZ)LgFQ~yL)M%KS28%(zAkq0
z^v?52T}GYX_2)^S*qx#s{YW<TjLi+-J6~s=+B4y|QN)X|RSMCcx9;JX)ULVp^n(u%
zjy1+*ae`A~C!-mQ1TcXq5J+G=$O*~&Ap0Nw^?aX}X(_yZ@@2jHvsC9e)uV#qsuo|j
z))h2=s5x5o^~dSJe{)yYD!!SLJzMhi+r=#!X{F(JcTL)}C@wF7vB*wN^L*Nb@-OpS
zo^2{|IAbzdpX1=p*H3TgyqLQ$blb%M{Y78=7b~v*I&(vETXh*@?UU1Qt#Vb{c>XWj
zb69)P+pXWd&eu*naK6O#$mZ|o)_6USWep6RASQ0R?fUd<N0+L(G`$tmzc0bo(EM?_
z{Bx_`%|AYb+0JjO=@kfiD)#V$eZ!eerE>&UNAV}9JGD&rZ2J4Pt#^^1%efMF8Rl=H
qN~>zN9aya4e<#&sex^yr4sFGGr<1a3E47YZd?l8fbzDPs;S2zu!8y7B

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/B662E42F-1.txt b/tests/openpgp/tofu/conflicting/B662E42F-1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c39056ce193fb18895637ff5273c73cf07f278a0
GIT binary patch
literal 340
zcmV-a0jvI_0h_?f%)r5@CAPeOThbGK#?u^03=ytrjD}pDjK(Ysj2sNIVu~#JCe~}u
zXzjC!($kEFDP?5>sbk>c6o82|2(bV6%D$O6L;B4LyVigH8(jonMOX>kp00j*qHg*<
zoB4j%Qac<qGhZg?x(T-|%CQ&mJ(hZHRrfR7j}uz2>}FBYyCu`{%<w{5wWDxT?9DpO
z71>`OJ-GLAP7+tTz?NH9KItyPO-kZfOApP<{>eLo%i-9(?Q3QfzKXjbFR^UWNsAkO
z*M-{`tkKX=Pk1j@xuvksZjZ&1{|~EQx0N0B-dmEPTW8$exPd{SHgd}8q<h~A4^)_|
zuDbj7>#J_h)TR$+dmotnn6+gyi;wfc&+ns-JgIpiI_djtrwr*+58s-{UU89=(~7WJ
mvFihW+nNKjUM=6Tcj~;Z`?1c)D(aQ;Y6>GJPP=;c>K*`k{kALs

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/B662E42F-2.txt b/tests/openpgp/tofu/conflicting/B662E42F-2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a96ef9f2971a87ee859177019f30374fd4338ec1
GIT binary patch
literal 339
zcmV-Z0j&O`0h_?f%)r5@CAPeOThbGK#?u^03=ytr>_%LjjK(Ysj2sNIVu~#JCe~}u
zXzjC!($kEFDP?5>sbk>c6o84CPhtNn#poQ9vcNIn@nm0LAqlIC-=2Rxm!9Zixo*z)
zD}AqycRk9CUhr`LJ9gXqCcXckMO!S(DO>oK>+7B+pFE!({;kevc`3+t5&uuQHK*dM
z7yZ}K{`EO8wW&?@3A5P&XHEZ(SD__#C!Wl$WGbEgXH9wD_nUqj-gk4YHjef@yh*3L
zBcQ=`PH_KY=M8oTuijjJQPqGq@R7iZU%4Su7iNhZblqC1l<<wE-~r#uz=SnZo7W#U
zE}lNeFxK0?x=6Ly{$F-LZQjDG8<u-(a@Pw^-@7-jZ@Tr_o$Gm=nWmmUqAZc=5>{PW
l^18e}U84Hpiuz4#e5+ndevkg&5u0k&Ui$gT;;3+QWdIPDw{8Fc

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/B662E42F-3.txt b/tests/openpgp/tofu/conflicting/B662E42F-3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2e6e81b442b6326b11c58389f7a99e4db57850f4
GIT binary patch
literal 342
zcmV-c0jd6@0Rc||u>Oz@0{{pCDi)`YwqoQj0m}$t09Zw44KoUf0W$;u0SEvc79j+0
zG&`-#D!x2gE-70o7N?K4V&pFc0$4?64FC!W5God@kG5juFB`lE|7f@~p(w2Sgur+1
z`3BgYeTo*@rTUeVe&_@HG&A;+p2UZYf%dIg?rA=5TunPz75BX@*8=x>X_$zEE^U(D
zr&cLB4VwQ;(A~MZs#Y4%7>w(%BBB-^w^W-&#+=$ON<g8q^9JCb-gkL|{oB<}*pJzf
z6tmEp>s8W+nZ&$k-y!y7hxkq~?4HSCTft4aVv!Es$VRe*X7ERVpadpRxU8mK;?G}k
zvVNH{xJz0I&*+hBM6q}k@nJ5I*_C&80`ct|M(!@p(N;m$1V3o*ii@_ydkE%>NlgF6
ovg-Sk$`{z;Dyh+AFrg1gs!fcX#;h=kG$Pn%_>M2N@+mdOcZ$lRr~m)}

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/B662E42F-4.txt b/tests/openpgp/tofu/conflicting/B662E42F-4.txt
new file mode 100644
index 0000000000000000000000000000000000000000..470882f6845b35ff7bd1ea114c0cdd1471d44277
GIT binary patch
literal 340
zcmV-a0jvI_0h_?f%)r5@CAPeOThbGK#?u^03=ytr!X{jujK(Ysj2sNIVu~#JCe~}u
zXzjC!($kEFDP?5>sbk>c6o82+U10yGE99R3d`{Kf$#Hf6@64CsF|^(i=x&;PU&h8Z
z(_DUQx^Cx6-We-80&neT<+-e|*~j_E<FofV53P(nnOG95yZUzMg0ib`1Al0ov~Yjl
zm-DMDz=&bZG2c>sSHb^#*BJf()TDEyRQB>knfNMw{^`Ow5C5&2^Yreg!h+SgU-Eh)
zm*rVK)qb-e{?&8+-|{b4MeO69^I@LXyNmvr53c`AmFo70(z_Vvbo9fk=a!3gZ{+De
znc}@i&L}r5+hX5aX0db~iA8*i&ptO$zVu>(lupU!kLS~T4R^o1^rF?(tIh4>gS9c6
mU$V@O^?%a;S<?PozW+isXNx6~2NK!s0-qXfb=EAa*#!VW@58MC

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/B662E42F-5.txt b/tests/openpgp/tofu/conflicting/B662E42F-5.txt
new file mode 100644
index 000000000..21d54bc4a
--- /dev/null
+++ b/tests/openpgp/tofu/conflicting/B662E42F-5.txt
@@ -0,0 +1 @@
+�
�������%��[�}��I�i��\���,��b�,�&�k�h����ӌ�)ee�c����h&q0l�;S�ɵ�`��K��>��}i��w��5?V��F+'	|]�$�/��j�m���J�ߖTjY�����<���i��6%�|����a��GVkg�4e��<ak����B� U�o�ff��Z<��U[��h��Je���n�����뤙�����
f~�[�dm"v��?P3}=����}�#"�^����j-����Tҁ�՜+/q�=�&��>̬��������%��k�z��N���lʳ�מ����:������7z�����\o޵s��J�s1����

\ No newline at end of file
diff --git a/tests/openpgp/tofu/conflicting/B662E42F-secret.gpg b/tests/openpgp/tofu/conflicting/B662E42F-secret.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..7362ded63fb2a3f7cccecc37c3e4f479ad93283e
GIT binary patch
literal 2537
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

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/B662E42F.gpg b/tests/openpgp/tofu/conflicting/B662E42F.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..6c07520f9696eb166df69bb94c601350cf9630a5
GIT binary patch
literal 1235
zcmbQq$jcJp8llI?!SHtK@s<-`GV`bNo=$!Ef8`6VWz!p1ORe~PP?YsUbS~ew6fT3j
zhZ8QkeBNnd@WS-krd@S6*5<|kGi(UB{ov2(<C2nh6kc99dtv4Tw?)Z4?z7ike1BAx
zxopj&-~z@hZk{$#t0Rheol31Te$Ml=V=fhV^euFqr2oj1w}qeoDHm%vTXe4B%17^~
z&WN|3`dLq+^-aH@?$mwG-R=(*ly+SW5)a$M_pSfs1C8cgG5<tc5-R?dy_9g0J>yfv
zV9b}#GRbCw@V_$q;zi4!`d)bX?dk%7PN6rCSdQ^76YqQ>c*VH-T#4Q8cimHNt>JL#
zywoOs^-E<qw@mA*mrp864F#^=k73-+AjrtTxJBJ7KRZ>yEit(yzo=5dCJV^ZOM~zn
zQY#X33vyERlJj%zIvM>~gn^-EA*RTZZ(_anjMhGzC_T++EwSbO+mfE>voe8#l}VbJ
zm79};orz79gOiJ!iA9WwnUP73kx9IPfs0cBrkJsrgJF}4@cJ^d_r7=4B&wWTj&I(z
z?0IsW(~Zai#^=`(U;p|NBFWO+v{fw8I4$a^<{@v<CrxXU7fz~Uk(jZ2_i|$$nJwJE
z1G)dR_-!*f!du<)dLf_cWh1LJ#{eJ2pDIi8uCD6-FYI6Dx&6X{hc34!{9Ge;_viD1
zeGyabcQf`2P1>q|L^@cv<hOdW4mV>e_rIK|ltW8SpPBmh!_|_R2d39OVGOc*AiK!p
z-(*|;NY{^=yH6^(|Fv6SqAF!@XyfUn1{XJpH8jPz3Qvu6TXA+9$8U)}=jLZFt8{95
z`5@Q5_3(DT_8+2oel2spHaZ_^s7&{*l{uazUCc4Pc;$lI{n1bQk5{YgM5M&)$EOE-
z_%C3Km{s@4^k|{z8#iCp78S|-h>5vTXCDQ+atgIFNzXL6-XZ_N_Vv=c>@P~sFZ`-@
z{o>pjzc~*UWc{BYC&85Jcu`<^gH)aKp0lw6eIkpuIq2OipJZb7=Bsw>!N)tQSlu5p
z-Tb^zw(`-@`8{3}nD^({oVI+b_Mg3Dvo`D6l){(Kno~H$lER$!%dBdD)Fz@_BT_l-
zV3f7v=_flJ{rMv}CRl};bF8<^S)}OlO3P2{eaM6$$M?2zi#lH|ogg(KWzJXrXSLyr
zt=~!B+1wsET{$lQW5~LlPOltWOViY>uHTy)QS8T9dMUmmzuwy3@taWLQSBi1qsK1B
zl(q+gQ(`Bh8H)rkfhiD3U_8hP>3<~qKb7QcfnV}WVgB7tA3w&QIHI-livuga#G9$H
zqW8MggB|Oiw6M5M;`XkJ5ta!SVG?<Izi<6U`=ZO)*Z0pho8a%{pP)ENeE+!yzqr+g
zCy)KxqWtrwCueW-mhX<&gSkum_lnN%GZt5>o5$aw>+76fxw5Lpv@zi3i=QW|CE}~5
zUr&4eKlg@h;*I|n3`~2Dhw@f@d0uCFt}BFLsfj?@qnArv8XEg%<lFA3%@UtKJvK>p
zD$CAyUbQoH;{~UtmOp5m_-Ow-#uKL||JkdYclyVZ`QPeeWjD^YJoH@NM<M3CSLyvZ
mJTu~%nO7V>bmZ^)saIXIF34=u=C~#I?&#{-;%6DcM413@ZX|^O

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-1.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1b3de477e2ec712310268a63efcdf4a1e86b1639
GIT binary patch
literal 340
zcmV-a0jvI_0h_?f%)r6;uBLX$K9<+ojHfx07$RKL7!A2P8I4&O7&#bZ#S~elU+dYq
z!M@S_b%&<|Oerf9NF4(grvOaEiiQ2J>{X76obQQ$_TO+|DgDxPAlBY+hxZ~6rJ4c*
zkKZ4jr+v*o6IOTqUXG#3`_If0nH4^Z`}Fc3ckYr8u6uFB{5Z3rkI3BUt#|he)~%ed
zPQmW`uJff6mWR)Bs}{SreTnkiojjj+WlmNXC}yayD_pgq(re9sw`%tLhgMg9iCHdk
zaca7Z^4zmqC&ur4b<R0*o0Md-%qk_}q-_f`mK;#9egDqs?sZ?;#R<Q*&s}%J^>x?t
zi3?NCWT{E>uW?V^r4XUHws@!g?p_{)%V$$~V%^w1V|w%?s%jH!;;vi>@Y;Sm-R^cK
m>-R(YeZ5=HT-IcNC-S*!d-{WJ&DVDVo}Tnw@oI+Lbrt~7X1Or{

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-2.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f4f5487b385f2333e75c384a5f45dbff72e7bd26
GIT binary patch
literal 342
zcmV-c0jd6@0Rc||u>Oz@0{{pC?tFcuz69$l0m}$t09Zw42QmtY0W$;u0SEvc79j+e
z){MEZKY=&vh)F>1e0`+81nVmW0$4?62LK8Q5bk_^q`m~}D;F&Y0LSpNC4Xkzvsd%Q
zbCwv<e$Yv)UIcq=+;ISk@li;qHTWDdo41AAaQgQV_PY#A0X1^;GjIU@FYTx^u%G>E
zv%X&gcFODc>j;esN2N0fz+60%7Jg=V1<eEp-{M8Zr<~IN0a_quiMvEqE9FB;pf-DJ
z5s&)n(7WO6KiRYNZq3??XM&MET}wo%;8w&={IYPtilYeY#$d<ucZk)9xQqcg;dlTO
z;hrnTgjYtDeGTe6&rvA->m?a39HZht&Z}1P9^pwFL_zNUf>pjuPa`%95TkV5`Tz&S
ot^XM1nBd*0>$<?_+-G5;f@jU=CxvLF5;f?Nc{!L74*~sd&Kp#q5C8xG

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-3.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..74510739b2eb8afa9c4b34403ceb014636e30633
GIT binary patch
literal 340
zcmV-a0jvI_0h_?f%)r6;uBLX$K9<+ojHfx07$RKLc#XL_8I4&O7&#bZ#S~elU+dYq
z!M@S_b%&<|Oerf9NF4(grvOYOsD}N2x!cjte7pXboinX=;a)mb+oo4petF!a3HPKv
zKiYLa`OmcKgcl_)oE*IWQa@~RU8Z+9kv-f}^=j#k4cz=yHszk>1)VP^yB7ssP*>d^
zp&|RDJ3*sqUqU~t&;NxEF|!SQ_8!qpFq`vsYu!tk;KnKCK3SL9ikDm4f64rPJZ-L-
zUHP`nVtPuIq8BwKughtClW&--&Bt!|j#aGa+r_=%%V({VFn_0ZnSb|M-2gqE3CtZ@
z66q!7wdT3E=D6Q~G)H`yUX!uEipb(6<)1eyt+Zcjess(8ex76h?PjKIJHVh?ushQG
m72}h;9~^H5{M*KMOl{rFLuZ#voSb#(-od{)V%I$Xod5s>m9vuo

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-4.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-4.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f15496d6d401536adb59ed76ddae34777a2040c3
GIT binary patch
literal 342
zcmV-c0jd6@0Rc||u>Oz@0{{pC?tFcuz69$l0m}$t09Zw46Eq5m0W$;u0SEvc79j+e
z){MEZKY=&vh)F>1e0`+81nVmW0$4?6695Vc5bk_^q`m~}E44ER{yV2J{^-le<*QP^
zEUJ7s#Qo{9zp31I++F+&c9g3}ICF={TvawX!5MYJee#=^IAEbE`ekKY8BsK5j*Ov)
zxKM&Y&Y~z@el|R$?SHCAChIPq=S}^my@lyGk+5iZh3a1^whI3gP^S|AQWVD!+ztu;
z%2oc13$K6{;=o9=zXD0^zS%_5loEn$sjaHQD@OHSnZ}SU%Y~#2$|yBsr$bZ6+_3w+
zPN?^1#HeMj)WLLKUHHQs#+$fy1ro1pDRzO>`LJ=Ra?$3Qb)J7|Xj!XtCTp|HZ$sfR
o;{Opx4NVp|jBCScVBIgWouKbq7~WdRP;K*E6bgH2P9qu7fMmU*ZvX%Q

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-5.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-5.txt
new file mode 100644
index 0000000000000000000000000000000000000000..39078f1b736d0617bcb8e09c7cff28d10b54082a
GIT binary patch
literal 340
zcmV-a0jvI_0h_?f%)r6;uBLX$K9<+ojHfx07$RKLBu%+G8I4&O7&#bZ#S~elU+dYq
z!M@S_b%&<|Oerf9NF4(grvOZ3Qw#h5$hWx@_Z{wAAza)sm+yH-KjTL?29er5l3z=H
zEt>MF>)*-+ny(-H)@;^1@K(|_GEC>l^gKzny}G;N*)4OK6r^@~)V^ADx#Cj)k`2F{
z3Y0V0mvc}0t@h!d)q`ogyf4pc<wUsVn)F31`yMm%vYOJ$x@^r!Y4Zx+JZAgg)w0Tl
zanG!2D)|;%8`tmC*mur+-j=Uwy&kQ1=U?DGy7Xp~&I9u`UB8!E%fG3bCUs<KG*44{
zs{7f49T{G$SXb6@eNH>1{Um6X_5n3}$%ooPS2-4)s!+_B&DCq`=2<iIlFP?~scF`>
mVXv!$4bEmQ?pX9nRx#<XSop2VpDYuu>Mc0DfBB+#`yv3Bced96

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg b/tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..5d393aa5aa3b24f26a73772c57f8612164ed1970
GIT binary patch
literal 2537
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

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B.gpg b/tests/openpgp/tofu/conflicting/BE04EB2B.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..787b238f65119e62d97045eb0a662725909fc7d5
GIT binary patch
literal 1235
zcmbQq$jcJp8ZO7k!SHm6`5k5p?GH<QtESGCUuN)RAzQFp&HfyvoO?E2Ti;H+$<CuX
zU&{NO;Nf`bT;>*8gSNMa931VIZ1}oh@i+0ex#xLy#xiVODeHaW#G*&d-A&2LrDDI%
z<>qO<>SR0+_Gmq~GJ{{pe4n6}%kE(bnN8lUC4AaU6O=ABZ+YEg?YcWE(n3UKP2fGZ
zyw0rBJqpX6np`XY%{y(u(Xr_D^Q<GAQ(W$BzwqHn!%mUEVj^=MZk({R-R0!Af?cO(
zon$rWT9)v*@!s;kA&)w)>&SRi^8fMR&D(0myXN`dw=4ec<TU&-XKImI{*|`*T$jTV
z54?7YSg&@fWqPLM`*&@>l*}i*OJnh55M*Rv+@kK4pPj1UmY7_UUsS1JlLh4Ir9pTO
zsTGO21v#mD$@#f<os51g!oX0o5L0BCeywNc2Kz?y*Bzb??`mq7>|=SY&B_D{Rwij?
zR&GuXb|yAa4o)s^CKfR!W=1ACMketF1};tknBq$}IT+TjIQvh0am&J*(0JBq^J>?I
zxV{r&nk>v5GLf$=zk;_;k8$(AGf540QabmaUi;RSGW}RQ`y@p>E^aronfW1$+$`BG
zUpPH~^5WjsQxo1!Up=>4DDv4tpT(^i>lT<Nln2PXSu<mM`usN{0t<ZHzgToGGnJ`}
zFW2Ky)y<lE_+iwC5aEf|tnVKyl(Z@yS1_8ZrygPcEpVRkouYq-3v416f9Dn4rxIRW
ztE#tu@^jhbq~5<%y}xF)&yIEUi2GaQcSCn^e`=D_x5Fa6J3X6!&5{y0?RSsGx$D%b
zu6y<kLZ-*-=55cswr1J0*l%j5`-^@=>Ye&@MBc^fy6Nn*4<CuJ6|XwH6Oj`4DP&(3
z3!J}t|J8J9waX8SG)~lQSr{4R!{d7T_?p)o!EYHe%N9*gD9SA8n00smG?m)QmW$F-
z`;1TUw)Z{y8nS%r=0`V9U0fYL^KtY2jX%EZeV<a5svf$8VXD&IX+{z3A;rl(Zf*x1
zZDVeq-L_|E>%VW!$<KoRUD>U4`_R|boMB5JS2bs<-4E&8aNtltVENKx4!b$tRP@_V
z3Ncs{eRtAyi=Vf07$kP-1Wb83i{)g>;*R!M>*~vsAC$43tI^7itxPzze)p{jhqhGY
z&MLM~x~#{uclvXItlVX<H#_8f0h;a`_axu*b!Fe$q^`KjM=ZZ_rPQyUc35fY<u}{7
z`fds6e+8$+PDV2p319+KAdtX#kQ36=)f^1R&h5GDr8F_|yhqp9EuV81-I%4By1|l3
zBcS?@L9XhmrCm>-iM>e*nrXhs>$3UN63wJXJ%6vW9q-S4cUElc-F2oNTG5ZEeUgk|
zZ9jWSODc<fQhwHK&6+a|dp@1p87!Dre{<z8$J?ft6#l<nzcgGhI5a-&dEvVS<y%hP
zXja~5oFQ8x8}<CNrRwp94YJPX=EpT>+uzS;b+~G~H`*lPR>;@J24BY;hxYiU`@~Ms
zI-h=fn(1HLfJtF<%YP+!{3>1{YBlHVJtgBMKE1tL90SS~jV7<%`Qm-_tl3?f9hN`N
pKhJF|ZgW_{b-eOtMew)zM+$cwU1B)rjWc7zkxgnGE#W5Wp8@<wL4N=M

literal 0
HcmV?d00001

diff --git a/tests/openpgp/tofu/conflicting/README b/tests/openpgp/tofu/conflicting/README
new file mode 100644
index 000000000..e2c48f2eb
--- /dev/null
+++ b/tests/openpgp/tofu/conflicting/README
@@ -0,0 +1,8 @@
+This directory contains three keys (1C005AF3, B662E42F, and BE04EB2B),
+which all have the same user id, namely "Joke Factory
+<joke.factory@example.com>".
+
+The keys are stored in KEYID.gpg.  The secret key material is stored
+in KEYID-secret.gpg (the secret key material is not password
+protected).  The files KEYID-N.txt contain messages, which are signed
+by KEYID.  The message is "N\n".