From ab7dddea907ebb226fd657cc2fad441a374dfd7f Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sat, 24 Oct 2020 02:17:37 +0200 Subject: Move mml-sec.el test data to follow our conventions * test/lisp/gnus/mml-sec-tests.el (ert-x): Require. (mml-secure-test-fixture, mml-sec-test--kill-gpg-agent): Use ert-resource-directory. * test/lisp/gnus/mml-sec-resources/*: Moved from test/data/mml-sec/. * .gitignore: Update location of moved file "random_seed". --- test/data/mml-sec/.gpg-v21-migrated | 0 test/data/mml-sec/gpg-agent.conf | 5 ---- .../02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key | Bin 797 -> 0 bytes .../171B444DE92BEF997229000D9784118A94EEC1C9.key | Bin 526 -> 0 bytes .../19FFEBC04DF3E037E16F6A4474DCB7984406975D.key | Bin 841 -> 0 bytes .../1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key | Bin 797 -> 0 bytes .../293109315BE584AB2EFEFCFCAD64666221D8B36C.key | Bin 526 -> 0 bytes .../335689599E1C0F66D73ADCF51E03EE36C97D121F.key | Bin 797 -> 0 bytes .../40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key | Bin 797 -> 0 bytes .../515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key | Bin 798 -> 0 bytes .../5A11B1935C46D0B227A73978DCA1293A85604F1D.key | Bin 798 -> 0 bytes .../62643CEBC7AEBE6817577A34399483700D76BD64.key | Bin 526 -> 0 bytes .../680D01F368916A0021C14E3453B27B3C5F900683.key | Bin 710 -> 0 bytes .../6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key | Bin 798 -> 0 bytes .../78C17E134E86E691297F7B719B2F2CDF41976234.key | Bin 527 -> 0 bytes .../7F714F4D9D9676638214991E96D45704E4FFC409.key | Bin 798 -> 0 bytes .../854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key | Bin 526 -> 0 bytes .../93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key | Bin 709 -> 0 bytes .../A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key | Bin 797 -> 0 bytes .../A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key | Bin 710 -> 0 bytes .../AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key | Bin 841 -> 0 bytes .../C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key | Bin 841 -> 0 bytes .../C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key | Bin 527 -> 0 bytes .../C67DAD345455EAD6D51368008FC3A53B8D195B5A.key | Bin 710 -> 0 bytes .../CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key | Bin 797 -> 0 bytes .../CC68630A06B048F5A91136C162C7A3273E20DE6F.key | Bin 710 -> 0 bytes .../E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key | Bin 797 -> 0 bytes .../F0117468BE801ED4B81972E159A98FDD4814DCEC.key | Bin 797 -> 0 bytes .../F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key | Bin 841 -> 0 bytes test/data/mml-sec/pubring.gpg | Bin 13883 -> 0 bytes test/data/mml-sec/pubring.kbx | Bin 3076 -> 0 bytes test/data/mml-sec/secring.gpg | Bin 17362 -> 0 bytes test/data/mml-sec/trustdb.gpg | Bin 1880 -> 0 bytes test/data/mml-sec/trustlist.txt | 26 --------------------- 34 files changed, 31 deletions(-) delete mode 100644 test/data/mml-sec/.gpg-v21-migrated delete mode 100644 test/data/mml-sec/gpg-agent.conf delete mode 100644 test/data/mml-sec/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key delete mode 100644 test/data/mml-sec/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key delete mode 100644 test/data/mml-sec/pubring.gpg delete mode 100644 test/data/mml-sec/pubring.kbx delete mode 100644 test/data/mml-sec/secring.gpg delete mode 100644 test/data/mml-sec/trustdb.gpg delete mode 100644 test/data/mml-sec/trustlist.txt (limited to 'test/data') diff --git a/test/data/mml-sec/.gpg-v21-migrated b/test/data/mml-sec/.gpg-v21-migrated deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/test/data/mml-sec/gpg-agent.conf b/test/data/mml-sec/gpg-agent.conf deleted file mode 100644 index 20192990caf..00000000000 --- a/test/data/mml-sec/gpg-agent.conf +++ /dev/null @@ -1,5 +0,0 @@ -# pinentry-program /usr/bin/pinentry-gtk-2 - -# verbose -# log-file /tmp/gpg-agent.log -# debug-all diff --git a/test/data/mml-sec/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key b/test/data/mml-sec/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key deleted file mode 100644 index 58fd0b5edbc..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key b/test/data/mml-sec/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key deleted file mode 100644 index 62f4ab25a69..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key b/test/data/mml-sec/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key deleted file mode 100644 index 2a8ce135fb2..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key b/test/data/mml-sec/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key deleted file mode 100644 index 9f8de71c5e2..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key b/test/data/mml-sec/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key deleted file mode 100644 index 6e4a4e548fd..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key b/test/data/mml-sec/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key deleted file mode 100644 index cff58edaa89..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key b/test/data/mml-sec/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key deleted file mode 100644 index 14af8662f79..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key b/test/data/mml-sec/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key deleted file mode 100644 index 207a7237d3a..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key b/test/data/mml-sec/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key deleted file mode 100644 index 85ca78da04d..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key b/test/data/mml-sec/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key deleted file mode 100644 index 79f3cd2b841..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key b/test/data/mml-sec/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key deleted file mode 100644 index 776ddf7e9e2..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/680D01F368916A0021C14E3453B27B3C5F900683.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key b/test/data/mml-sec/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key deleted file mode 100644 index 2b464f0ccbe..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key b/test/data/mml-sec/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key deleted file mode 100644 index 28a07668b21..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key b/test/data/mml-sec/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key deleted file mode 100644 index 137659693bd..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key b/test/data/mml-sec/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key deleted file mode 100644 index c99824ccd43..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key b/test/data/mml-sec/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key deleted file mode 100644 index 49c2dc58bd8..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/93FF37C268FDBF0767F5FFDC49409DDAC9388B2C.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key b/test/data/mml-sec/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key deleted file mode 100644 index ca128408952..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key b/test/data/mml-sec/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key deleted file mode 100644 index 3f14b40927a..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/A73E9D01F0465B518E8E7D5AD529077AAC1603B4.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key b/test/data/mml-sec/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key deleted file mode 100644 index 06adc06c427..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key b/test/data/mml-sec/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key deleted file mode 100644 index cf9a60d233b..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key b/test/data/mml-sec/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key deleted file mode 100644 index 0ed35172fe0..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key b/test/data/mml-sec/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key deleted file mode 100644 index 090059d9e81..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/C67DAD345455EAD6D51368008FC3A53B8D195B5A.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key b/test/data/mml-sec/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key deleted file mode 100644 index 9061f675121..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key b/test/data/mml-sec/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key deleted file mode 100644 index 89f6013100d..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key b/test/data/mml-sec/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key deleted file mode 100644 index 41dac37574e..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key b/test/data/mml-sec/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key deleted file mode 100644 index 5df7b4a5953..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key and /dev/null differ diff --git a/test/data/mml-sec/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key b/test/data/mml-sec/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key deleted file mode 100644 index 03daf80975b..00000000000 Binary files a/test/data/mml-sec/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key and /dev/null differ diff --git a/test/data/mml-sec/pubring.gpg b/test/data/mml-sec/pubring.gpg deleted file mode 100644 index 6bd169963df..00000000000 Binary files a/test/data/mml-sec/pubring.gpg and /dev/null differ diff --git a/test/data/mml-sec/pubring.kbx b/test/data/mml-sec/pubring.kbx deleted file mode 100644 index 399a0414fd2..00000000000 Binary files a/test/data/mml-sec/pubring.kbx and /dev/null differ diff --git a/test/data/mml-sec/secring.gpg b/test/data/mml-sec/secring.gpg deleted file mode 100644 index b323c072c04..00000000000 Binary files a/test/data/mml-sec/secring.gpg and /dev/null differ diff --git a/test/data/mml-sec/trustdb.gpg b/test/data/mml-sec/trustdb.gpg deleted file mode 100644 index 09ebd8db114..00000000000 Binary files a/test/data/mml-sec/trustdb.gpg and /dev/null differ diff --git a/test/data/mml-sec/trustlist.txt b/test/data/mml-sec/trustlist.txt deleted file mode 100644 index f886572d283..00000000000 --- a/test/data/mml-sec/trustlist.txt +++ /dev/null @@ -1,26 +0,0 @@ -# This is the list of trusted keys. Comment lines, like this one, as -# well as empty lines are ignored. Lines have a length limit but this -# is not a serious limitation as the format of the entries is fixed and -# checked by gpg-agent. A non-comment line starts with optional white -# space, followed by the SHA-1 fingerpint in hex, followed by a flag -# which may be one of 'P', 'S' or '*' and optionally followed by a list of -# other flags. The fingerprint may be prefixed with a '!' to mark the -# key as not trusted. You should give the gpg-agent a HUP or run the -# command "gpgconf --reload gpg-agent" after changing this file. - - -# Include the default trust list -include-default - - -# CN=No Expiry -D0:6A:A1:18:65:3C:C3:8E:9D:0C:AF:56:ED:7A:21:35:E1:58:21:77 S relax - -# CN=Second Key Pair -0E:58:22:9B:80:EE:33:95:9F:F7:18:FE:EF:25:40:2B:47:9D:C6:E2 S relax - -# CN=No Expiry two UIDs -D4:CA:78:E1:47:0B:9F:C2:AE:45:D7:84:64:9B:8C:E6:4E:BB:32:0C S relax - -# CN=Different subkeys -4F:96:2A:B7:F4:76:61:6A:78:3D:72:AA:40:35:D5:9B:5F:88:E9:FC S relax -- cgit v1.2.1