From 0c56ad5a8d89d69a9ed00571720b3b105f955214 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Thu, 13 Oct 2016 21:38:50 +0200 Subject: tests: Use shorter filenames. * tests/openpgp/tofu/cross-sigs/ 1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ 1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt: Rename from this... * tests/openpgp/tofu/cross-sigs/EC38277E-1.txt: .. to this. * tests/openpgp/tofu/cross-sigs/ 1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ 1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt: Rename from this... * tests/openpgp/tofu/cross-sigs/EC38277E-2.txt: .. to this. * tests/openpgp/tofu/cross-sigs/ 1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt: Rename from this... * tests/openpgp/tofu/cross-sigs/EC38277E-3.txt: .. to this. * tests/openpgp/tofu/cross-sigs/ 1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-1.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-1.txt: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-2.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-2.txt: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-3.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-3.txt: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-4.gpg: .. to this. * tests/openpgp/tofu/cross-sigs/ DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg: Rename from this... * tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg: .. to this. * tests/openpgp/Makefile.am (TEST_FILES): Update accordingly. -- Signed-off-by: Neal H. Walfield Fixed-commit: d2d936fbe86d61b89cead95df633b2b575690e05 --- tests/openpgp/Makefile.am | 28 ++++++++-------- tests/openpgp/tofu.scm | 36 ++++++++++----------- .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg | Bin 1171 -> 0 bytes .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt | Bin 321 -> 0 bytes .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg | Bin 1458 -> 0 bytes .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt | Bin 334 -> 0 bytes .../1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt | Bin 334 -> 0 bytes ...C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg | Bin 2473 -> 0 bytes tests/openpgp/tofu/cross-sigs/871C2247-1.gpg | Bin 0 -> 1173 bytes tests/openpgp/tofu/cross-sigs/871C2247-1.txt | Bin 0 -> 321 bytes tests/openpgp/tofu/cross-sigs/871C2247-2.gpg | Bin 0 -> 1460 bytes tests/openpgp/tofu/cross-sigs/871C2247-2.txt | Bin 0 -> 333 bytes tests/openpgp/tofu/cross-sigs/871C2247-3.gpg | Bin 0 -> 1800 bytes tests/openpgp/tofu/cross-sigs/871C2247-3.txt | Bin 0 -> 334 bytes tests/openpgp/tofu/cross-sigs/871C2247-4.gpg | Bin 0 -> 2087 bytes tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg | Bin 0 -> 2475 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg | Bin 1173 -> 0 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt | Bin 321 -> 0 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg | Bin 1460 -> 0 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt | Bin 333 -> 0 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg | Bin 1800 -> 0 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt | Bin 334 -> 0 bytes .../DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg | Bin 2087 -> 0 bytes ...3A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg | Bin 2475 -> 0 bytes tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg | Bin 0 -> 1171 bytes tests/openpgp/tofu/cross-sigs/EC38277E-1.txt | Bin 0 -> 321 bytes tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg | Bin 0 -> 1458 bytes tests/openpgp/tofu/cross-sigs/EC38277E-2.txt | Bin 0 -> 334 bytes tests/openpgp/tofu/cross-sigs/EC38277E-3.txt | Bin 0 -> 334 bytes tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg | Bin 0 -> 2473 bytes 30 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt delete mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt delete mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt delete mode 100644 tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-1.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-1.txt create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-2.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-2.txt create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-3.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-3.txt create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-4.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg delete mode 100644 tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/EC38277E-1.txt create mode 100644 tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg create mode 100644 tests/openpgp/tofu/cross-sigs/EC38277E-2.txt create mode 100644 tests/openpgp/tofu/cross-sigs/EC38277E-3.txt create mode 100644 tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am index be110fbed..bb9b2f4db 100644 --- a/tests/openpgp/Makefile.am +++ b/tests/openpgp/Makefile.am @@ -110,20 +110,20 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \ bug1223-good.asc bug1223-bogus.asc 4gb-packet.asc \ tofu-keys.asc tofu-keys-secret.asc \ tofu-2183839A-1.txt tofu-BC15C85A-1.txt tofu-EE37CF96-1.txt \ - tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg \ - tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg \ - tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt \ - tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg \ - tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt \ - tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt \ - tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg \ + tofu/cross-sigs/EC38277E-secret.gpg \ + tofu/cross-sigs/EC38277E-1.gpg \ + tofu/cross-sigs/EC38277E-1.txt \ + tofu/cross-sigs/EC38277E-2.gpg \ + tofu/cross-sigs/EC38277E-2.txt \ + tofu/cross-sigs/EC38277E-3.txt \ + tofu/cross-sigs/871C2247-secret.gpg \ + tofu/cross-sigs/871C2247-1.gpg \ + tofu/cross-sigs/871C2247-1.txt \ + tofu/cross-sigs/871C2247-2.gpg \ + tofu/cross-sigs/871C2247-2.txt \ + tofu/cross-sigs/871C2247-3.gpg \ + tofu/cross-sigs/871C2247-3.txt \ + tofu/cross-sigs/871C2247-4.gpg \ tofu/cross-sigs/README data_files = data-500 data-9000 data-32000 data-80000 plain-large diff --git a/tests/openpgp/tofu.scm b/tests/openpgp/tofu.scm index 2939250e8..3cca189a1 100755 --- a/tests/openpgp/tofu.scm +++ b/tests/openpgp/tofu.scm @@ -179,6 +179,8 @@ ;; The test keys. (define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E") (define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247") +(define KEYIDA (substring KEYA (- (string-length KEYA) 8))) +(define KEYIDB (substring KEYB (- (string-length KEYB) 8))) (define (verify-messages) (for-each @@ -188,12 +190,12 @@ (let ((fn (in-srcdir DIR (string-append key "-" i ".txt")))) (call-check `(,@GPG --trust-model=tofu --verify ,fn)))) (list "1" "2"))) - (list KEYA KEYB))) + (list KEYIDA KEYIDB))) ;; Import the public keys. (display " > Two keys. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg")))) -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg")))) ;; Make sure the tofu engine registers the keys. (verify-messages) (display "<\n") @@ -204,8 +206,8 @@ ;; Import the cross sigs. (display " > Adding cross signatures. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg")))) -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg")))) (verify-messages) (display "<\n") @@ -215,9 +217,7 @@ ;; Import the conflicting user id. (display " > Adding conflicting user id. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg")))) -(call-check `(,@GPG --trust-model=tofu - --verify ,(in-srcdir DIR (string-append KEYB "-1.txt")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg")))) (verify-messages) (display "<\n") @@ -226,7 +226,7 @@ ;; Import Alice's signature on the conflicting user id. (display " > Adding cross signature on user id. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg")))) (verify-messages) (display "<\n") @@ -255,6 +255,8 @@ ;; The test keys. (define KEYA "1938C3A0E4674B6C217AC0B987DB2814EC38277E") (define KEYB "DC463A16E42F03240D76E8BA8B48C6BD871C2247") +(define KEYIDA (substring KEYA (- (string-length KEYA) 8))) +(define KEYIDB (substring KEYB (- (string-length KEYB) 8))) (define (verify-messages) (for-each @@ -264,18 +266,18 @@ (let ((fn (in-srcdir DIR (string-append key "-" i ".txt")))) (call-check `(,@GPG --trust-model=tofu --verify ,fn)))) (list "1" "2"))) - (list KEYA KEYB))) + (list KEYIDA KEYIDB))) ;; Import the public keys. (display " > Two keys. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYA "-1.gpg")))) -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-1.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-1.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-1.gpg")))) (display "<\n") ;; Import the cross sigs. (display " > Adding cross signatures. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYA "-2.gpg")))) -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-2.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDA "-2.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-2.gpg")))) (display "<\n") ;; Make KEYA ultimately trusted. @@ -293,9 +295,7 @@ ;; Import the conflicting user id. (display " > Adding conflicting user id. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-3.gpg")))) -(call-check `(,@GPG --trust-model=tofu - --verify ,(in-srcdir DIR (string-append KEYB "-1.txt")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-3.gpg")))) (verify-messages) (display "<\n") @@ -304,7 +304,7 @@ ;; Import Alice's signature on the conflicting user id. (display " > Adding cross signature on user id. ") -(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYB "-4.gpg")))) +(call-check `(,@GPG --import ,(in-srcdir DIR (string-append KEYIDB "-4.gpg")))) (verify-messages) (display "<\n") diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg deleted file mode 100644 index e6becec47..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt deleted file mode 100644 index 92236be2e..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-1.txt and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg deleted file mode 100644 index d26bd541d..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt deleted file mode 100644 index b4013d364..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-2.txt and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt deleted file mode 100644 index 9b2d49d10..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-3.txt and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg b/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg deleted file mode 100644 index 1839e3a3e..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/1938C3A0E4674B6C217AC0B987DB2814EC38277E-secret.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-1.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-1.gpg new file mode 100644 index 000000000..f706f7037 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-1.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-1.txt b/tests/openpgp/tofu/cross-sigs/871C2247-1.txt new file mode 100644 index 000000000..0bdc1fc52 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-1.txt differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-2.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-2.gpg new file mode 100644 index 000000000..0b2485feb Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-2.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-2.txt b/tests/openpgp/tofu/cross-sigs/871C2247-2.txt new file mode 100644 index 000000000..4d3aaaa44 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-2.txt differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-3.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-3.gpg new file mode 100644 index 000000000..eb2c43532 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-3.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-3.txt b/tests/openpgp/tofu/cross-sigs/871C2247-3.txt new file mode 100644 index 000000000..9b2d49d10 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-3.txt differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-4.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-4.gpg new file mode 100644 index 000000000..9c98ec114 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-4.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg b/tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg new file mode 100644 index 000000000..a87c61b4f Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg deleted file mode 100644 index f706f7037..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt deleted file mode 100644 index 0bdc1fc52..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-1.txt and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg deleted file mode 100644 index 0b2485feb..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt deleted file mode 100644 index 4d3aaaa44..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-2.txt and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg deleted file mode 100644 index eb2c43532..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt deleted file mode 100644 index 9b2d49d10..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-3.txt and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg deleted file mode 100644 index 9c98ec114..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-4.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg b/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg deleted file mode 100644 index a87c61b4f..000000000 Binary files a/tests/openpgp/tofu/cross-sigs/DC463A16E42F03240D76E8BA8B48C6BD871C2247-secret.gpg and /dev/null differ diff --git a/tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg new file mode 100644 index 000000000..e6becec47 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-1.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/EC38277E-1.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-1.txt new file mode 100644 index 000000000..92236be2e Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-1.txt differ diff --git a/tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg new file mode 100644 index 000000000..d26bd541d Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-2.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/EC38277E-2.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-2.txt new file mode 100644 index 000000000..b4013d364 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-2.txt differ diff --git a/tests/openpgp/tofu/cross-sigs/EC38277E-3.txt b/tests/openpgp/tofu/cross-sigs/EC38277E-3.txt new file mode 100644 index 000000000..9b2d49d10 Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-3.txt differ diff --git a/tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg b/tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg new file mode 100644 index 000000000..1839e3a3e Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg differ -- cgit v1.2.3