From eee068778cb28ecf3c14e1bf843a95547d72c42d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 18:14:06 +0200 Subject: Adding upstream version 2.2.40. Signed-off-by: Daniel Baumann --- 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 tests/openpgp/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 + tests/openpgp/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 tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg | Bin 0 -> 2537 bytes tests/openpgp/tofu/conflicting/BE04EB2B.gpg | Bin 0 -> 1235 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 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 tests/openpgp/tofu/cross-sigs/README | 79 +++++++++++++++++++++ 36 files changed, 80 insertions(+) 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/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 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 create mode 100644 tests/openpgp/tofu/cross-sigs/README (limited to 'tests/openpgp/tofu') diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-1.txt b/tests/openpgp/tofu/conflicting/1C005AF3-1.txt new file mode 100644 index 0000000..dba581d Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3-1.txt differ diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-2.txt b/tests/openpgp/tofu/conflicting/1C005AF3-2.txt new file mode 100644 index 0000000..fde9fb8 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3-2.txt differ diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-3.txt b/tests/openpgp/tofu/conflicting/1C005AF3-3.txt new file mode 100644 index 0000000..e6aa4ac Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3-3.txt differ diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-4.txt b/tests/openpgp/tofu/conflicting/1C005AF3-4.txt new file mode 100644 index 0000000..6a14891 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3-4.txt differ diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-5.txt b/tests/openpgp/tofu/conflicting/1C005AF3-5.txt new file mode 100644 index 0000000..12fb5fb Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3-5.txt differ diff --git a/tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg b/tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg new file mode 100644 index 0000000..5f1e78a Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3-secret.gpg differ diff --git a/tests/openpgp/tofu/conflicting/1C005AF3.gpg b/tests/openpgp/tofu/conflicting/1C005AF3.gpg new file mode 100644 index 0000000..7a75011 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/1C005AF3.gpg differ diff --git a/tests/openpgp/tofu/conflicting/B662E42F-1.txt b/tests/openpgp/tofu/conflicting/B662E42F-1.txt new file mode 100644 index 0000000..c39056c Binary files /dev/null and b/tests/openpgp/tofu/conflicting/B662E42F-1.txt differ diff --git a/tests/openpgp/tofu/conflicting/B662E42F-2.txt b/tests/openpgp/tofu/conflicting/B662E42F-2.txt new file mode 100644 index 0000000..a96ef9f Binary files /dev/null and b/tests/openpgp/tofu/conflicting/B662E42F-2.txt differ diff --git a/tests/openpgp/tofu/conflicting/B662E42F-3.txt b/tests/openpgp/tofu/conflicting/B662E42F-3.txt new file mode 100644 index 0000000..2e6e81b Binary files /dev/null and b/tests/openpgp/tofu/conflicting/B662E42F-3.txt differ diff --git a/tests/openpgp/tofu/conflicting/B662E42F-4.txt b/tests/openpgp/tofu/conflicting/B662E42F-4.txt new file mode 100644 index 0000000..470882f Binary files /dev/null and b/tests/openpgp/tofu/conflicting/B662E42F-4.txt differ diff --git a/tests/openpgp/tofu/conflicting/B662E42F-5.txt b/tests/openpgp/tofu/conflicting/B662E42F-5.txt new file mode 100644 index 0000000..21d54bc --- /dev/null +++ b/tests/openpgp/tofu/conflicting/B662E42F-5.txt @@ -0,0 +1 @@ +%[}I i\,  b,&khӌ)eech&q0l;Sɵ`K>}iw5?VF+' |]$/jmJߖTjY̬%kzNlʳמ:7z\o޵sJs1 \ 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 0000000..7362ded Binary files /dev/null and b/tests/openpgp/tofu/conflicting/B662E42F-secret.gpg differ diff --git a/tests/openpgp/tofu/conflicting/B662E42F.gpg b/tests/openpgp/tofu/conflicting/B662E42F.gpg new file mode 100644 index 0000000..6c07520 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/B662E42F.gpg differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-1.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-1.txt new file mode 100644 index 0000000..1b3de47 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B-1.txt differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-2.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-2.txt new file mode 100644 index 0000000..f4f5487 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B-2.txt differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-3.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-3.txt new file mode 100644 index 0000000..7451073 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B-3.txt differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-4.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-4.txt new file mode 100644 index 0000000..f15496d Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B-4.txt differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-5.txt b/tests/openpgp/tofu/conflicting/BE04EB2B-5.txt new file mode 100644 index 0000000..39078f1 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B-5.txt differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg b/tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg new file mode 100644 index 0000000..5d393aa Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B-secret.gpg differ diff --git a/tests/openpgp/tofu/conflicting/BE04EB2B.gpg b/tests/openpgp/tofu/conflicting/BE04EB2B.gpg new file mode 100644 index 0000000..787b238 Binary files /dev/null and b/tests/openpgp/tofu/conflicting/BE04EB2B.gpg 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 0000000..f706f70 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 0000000..0bdc1fc 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 0000000..0b2485f 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 0000000..4d3aaaa 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 0000000..eb2c435 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 0000000..9b2d49d 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 0000000..9c98ec1 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 0000000..a87c61b Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/871C2247-secret.gpg 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 0000000..e6becec 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 0000000..92236be 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 0000000..d26bd54 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 0000000..b4013d3 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 0000000..9b2d49d 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 0000000..1839e3a Binary files /dev/null and b/tests/openpgp/tofu/cross-sigs/EC38277E-secret.gpg differ diff --git a/tests/openpgp/tofu/cross-sigs/README b/tests/openpgp/tofu/cross-sigs/README new file mode 100644 index 0000000..439962b --- /dev/null +++ b/tests/openpgp/tofu/cross-sigs/README @@ -0,0 +1,79 @@ +# How I generate the keys and messages to verify: + +# Generate and export two non-conflicting keys. +gpg --quick-gen-key 'Spy Cow ' +gpg --quick-gen-key 'Spy R. Cow ' + +KEYIDA=1938C3A0E4674B6C217AC0B987DB2814EC38277E +KEYIDB=DC463A16E42F03240D76E8BA8B48C6BD871C2247 + +for KEYID in $KEYIDA $KEYIDB +do + gpg --export $KEYID > tofu-$KEYID.gpg + gpg --export-secret-keys $KEYID > tofu-$KEYID-secret.gpg +done + +# Sign some data. +echo foo | gpg --default-key $KEYIDA -s > tofu-$KEYIDA-1.txt +echo foo | gpg --default-key $KEYIDB -s > tofu-$KEYIDB-1.txt + +# Again, but with an issuer. +echo foo | gpg --default-key "" -s > tofu-$KEYIDA-2.txt +echo foo | gpg --default-key "" -s > tofu-$KEYIDB-2.txt + +# Have A sign B and vice versa. +gpg --default-key $KEYIDA --quick-sign $KEYIDB +gpg --default-key $KEYIDB --quick-sign $KEYIDA + +gpg --export $KEYIDA > tofu-$KEYIDA-2.gpg +gpg --export $KEYIDB > tofu-$KEYIDB-2.gpg + +# Cause A and B to conflict. +gpg --quick-adduid $KEYIDB 'Spy R. Cow ' +gpg --export $KEYIDB > tofu-$KEYIDB-3.gpg + +echo foo | gpg --default-key "" -s > tofu-$KEYIDA-3.txt +echo foo | gpg --default-key "" -s > tofu-$KEYIDB-3.txt + +# Have A sign B's conflicting user id. +gpg --default-key $KEYIDA --quick-sign $KEYIDB +gpg --export $KEYIDB > tofu-$KEYIDB-4.gpg + +exit 0 + +# In a new directory (so the keys are not ultimately trusted). + +D=~/neal/work/gpg/test +echo 'trust-model tofu+pgp' > gpg.conf +gpg --import $D/tofu-$KEYIDA.gpg +gpg --import $D/tofu-$KEYIDB.gpg +gpg -k + +gpg --verify $D/tofu-$KEYIDA-1.txt +gpg --verify $D/tofu-$KEYIDB-1.txt +# With an issuer. +gpg --verify $D/tofu-$KEYIDA-2.txt +gpg --verify $D/tofu-$KEYIDB-2.txt + +# Import the cross signatures. +gpg --import $D/tofu-$KEYIDA-2.gpg +gpg --import $D/tofu-$KEYIDB-2.gpg +gpg -k + +gpg --verify $D/tofu-$KEYIDA-1.txt +gpg --verify $D/tofu-$KEYIDB-1.txt +# With an issuer. +gpg --verify $D/tofu-$KEYIDA-2.txt +gpg --verify $D/tofu-$KEYIDB-2.txt + + +gpg --status-fd=1 --batch --verify $D/tofu-$KEYIDA-3.txt | grep TRUST_UNDEFINED +gpg --status-fd=1 --batch --verify $D/tofu-$KEYIDB-3.txt | grep TRUST_UNDEFINED + +# Import the conflicting user id. +gpg --import $D/tofu-$KEYIDB-3.gpg +gpg -k + +# Import the cross signature, which should remove the conflict. +gpg --import $D/tofu-$KEYIDB-4.gpg +gpg -k -- cgit v1.2.3