diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0062E2DBC6D6848AE88BCE181CC1938F2FAC816C.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0062E2DBC6D6848AE88BCE181CC1938F2FAC816C.key new file mode 100644 index 00000000000..6f1e145295b Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0062E2DBC6D6848AE88BCE181CC1938F2FAC816C.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key deleted file mode 100644 index 58fd0b5edbc..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/02089CDDC6DFE93B8EA10D9E876F983E61FEC476.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/052E3324B4811A197A1DE922671AA6ABE475025E.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/052E3324B4811A197A1DE922671AA6ABE475025E.key new file mode 100644 index 00000000000..cdc19ed2660 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/052E3324B4811A197A1DE922671AA6ABE475025E.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/066DBED74BA05B5AA1E2A6E4634EF6F62C0D7A5F.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/066DBED74BA05B5AA1E2A6E4634EF6F62C0D7A5F.key new file mode 100644 index 00000000000..5a64f9f23ee Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/066DBED74BA05B5AA1E2A6E4634EF6F62C0D7A5F.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0B0D8E451BFADF816524AF5E185EBF3DED48CA00.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0B0D8E451BFADF816524AF5E185EBF3DED48CA00.key new file mode 100644 index 00000000000..995b93a4fc8 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0B0D8E451BFADF816524AF5E185EBF3DED48CA00.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key deleted file mode 100644 index 62f4ab25a69..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/171B444DE92BEF997229000D9784118A94EEC1C9.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1967CB6C7B1C00996FCFF5930C3467D3D4FB702C.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1967CB6C7B1C00996FCFF5930C3467D3D4FB702C.key new file mode 100644 index 00000000000..42773a1d968 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1967CB6C7B1C00996FCFF5930C3467D3D4FB702C.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key deleted file mode 100644 index 2a8ce135fb2..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/19FFEBC04DF3E037E16F6A4474DCB7984406975D.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key deleted file mode 100644 index 9f8de71c5e2..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1E36D27DF9DAB96302D35268DADC5CE73EF45A2A.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key deleted file mode 100644 index 6e4a4e548fd..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/293109315BE584AB2EFEFCFCAD64666221D8B36C.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/2C9A99AF2FB073D3328B0F995BD6DE74616A6CC2.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/2C9A99AF2FB073D3328B0F995BD6DE74616A6CC2.key new file mode 100644 index 00000000000..c4941533f4b Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/2C9A99AF2FB073D3328B0F995BD6DE74616A6CC2.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/3250B5BE67E704F82BC9AAE00EC8A0CAC8C2A94F.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/3250B5BE67E704F82BC9AAE00EC8A0CAC8C2A94F.key new file mode 100644 index 00000000000..6fbc08d06d6 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/3250B5BE67E704F82BC9AAE00EC8A0CAC8C2A94F.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key deleted file mode 100644 index cff58edaa89..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/335689599E1C0F66D73ADCF51E03EE36C97D121F.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key deleted file mode 100644 index 14af8662f79..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/40BF94E540E3726CB150A1ADF7C1B514444B3FA6.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key deleted file mode 100644 index 207a7237d3a..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/515D4637EFC6C09DB1F78BE8C2F2A3D63E7756C3.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5294CDB62DB28FBB486DE077DAF248FB32BE286A.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5294CDB62DB28FBB486DE077DAF248FB32BE286A.key new file mode 100644 index 00000000000..76418968b70 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5294CDB62DB28FBB486DE077DAF248FB32BE286A.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key deleted file mode 100644 index 85ca78da04d..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5A11B1935C46D0B227A73978DCA1293A85604F1D.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5B2B6633E89C0BD58A0FA2C785A31EAA96278695.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5B2B6633E89C0BD58A0FA2C785A31EAA96278695.key new file mode 100644 index 00000000000..89c2fb779d7 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5B2B6633E89C0BD58A0FA2C785A31EAA96278695.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/61F5836DA69D9F63059D2665451F18E4346DF43A.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/61F5836DA69D9F63059D2665451F18E4346DF43A.key new file mode 100644 index 00000000000..955ae5a0461 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/61F5836DA69D9F63059D2665451F18E4346DF43A.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key deleted file mode 100644 index 79f3cd2b841..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/62643CEBC7AEBE6817577A34399483700D76BD64.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/64CA92780975EEB798D2083FF25AFD43A4033DB7.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/64CA92780975EEB798D2083FF25AFD43A4033DB7.key new file mode 100644 index 00000000000..e5e07e65483 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/64CA92780975EEB798D2083FF25AFD43A4033DB7.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key deleted file mode 100644 index 2b464f0ccbe..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/6DF2D9DF7AED06F0524BEB642DF0FB48EFDBDB93.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key deleted file mode 100644 index 28a07668b21..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/78C17E134E86E691297F7B719B2F2CDF41976234.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7A788436224049A2FE1E446E16B70DB012C830BB.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7A788436224049A2FE1E446E16B70DB012C830BB.key new file mode 100644 index 00000000000..4df0858b89f Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7A788436224049A2FE1E446E16B70DB012C830BB.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key deleted file mode 100644 index 137659693bd..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7F714F4D9D9676638214991E96D45704E4FFC409.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key deleted file mode 100644 index c99824ccd43..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/854752F5D8090CA36EFBDD79C72BDFF6FA2D1FF0.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/8865328E25351B0D7697D4156A13497174F999D5.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/8865328E25351B0D7697D4156A13497174F999D5.key new file mode 100644 index 00000000000..d1faca42080 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/8865328E25351B0D7697D4156A13497174F999D5.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/9504643B1FB8AAC7529134D1565DF8B4ECA01E35.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/9504643B1FB8AAC7529134D1565DF8B4ECA01E35.key new file mode 100644 index 00000000000..711b4994cf2 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/9504643B1FB8AAC7529134D1565DF8B4ECA01E35.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key deleted file mode 100644 index ca128408952..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A3BA94EAE83509CC90DB1B77B54A51959D8DABEA.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A6BC0634D18962998AB53A0134DD2AD0DC4E0782.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A6BC0634D18962998AB53A0134DD2AD0DC4E0782.key new file mode 100644 index 00000000000..4d8a2da326e Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A6BC0634D18962998AB53A0134DD2AD0DC4E0782.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key deleted file mode 100644 index 06adc06c427..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/AE6A24B17A8D0CAF9B7E000AA77F0B41D7BFFFCF.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/BCFF2771AD5F49BEC185CDED47EC47D15550CB93.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/BCFF2771AD5F49BEC185CDED47EC47D15550CB93.key new file mode 100644 index 00000000000..52e1aaa9bab Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/BCFF2771AD5F49BEC185CDED47EC47D15550CB93.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key deleted file mode 100644 index cf9a60d233b..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C072AF82DCCCB9A7F1B85FFA10B802DC4ED16703.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C36C6A8B40A2179CFE83CB0C2827358AB171CDFD.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C36C6A8B40A2179CFE83CB0C2827358AB171CDFD.key new file mode 100644 index 00000000000..2c491e53614 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C36C6A8B40A2179CFE83CB0C2827358AB171CDFD.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key deleted file mode 100644 index 0ed35172fe0..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C43E1A079B28DFAEBB39CBA01793BDE11EF4B490.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key deleted file mode 100644 index 9061f675121..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CB5E00CE582C2645D2573FC16B2F14F85A7F47AA.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key deleted file mode 100644 index 89f6013100d..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CC68630A06B048F5A91136C162C7A3273E20DE6F.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CF723A68027A82B538F04BF4A2A1323D1B3E095C.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CF723A68027A82B538F04BF4A2A1323D1B3E095C.key new file mode 100644 index 00000000000..5e431d38a88 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CF723A68027A82B538F04BF4A2A1323D1B3E095C.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/D6A2C195DEBA3506F0ECFBE3DDD7C57F6913DC7C.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/D6A2C195DEBA3506F0ECFBE3DDD7C57F6913DC7C.key new file mode 100644 index 00000000000..8ed162c0236 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/D6A2C195DEBA3506F0ECFBE3DDD7C57F6913DC7C.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/DB8C922A471E08FAF083EC2465AFB4063904C282.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/DB8C922A471E08FAF083EC2465AFB4063904C282.key new file mode 100644 index 00000000000..969c2ec6906 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/DB8C922A471E08FAF083EC2465AFB4063904C282.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E0C3163E69C57319C6038F9EBE14F5D55DE553F7.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E0C3163E69C57319C6038F9EBE14F5D55DE553F7.key new file mode 100644 index 00000000000..1e4cef029f4 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E0C3163E69C57319C6038F9EBE14F5D55DE553F7.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key deleted file mode 100644 index 41dac37574e..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E7E73903E1BF93481DE0E7C9769D6C31E1863CFF.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/ECB164A45A1D5C5078508A9869DF6DB84DEA543B.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/ECB164A45A1D5C5078508A9869DF6DB84DEA543B.key new file mode 100644 index 00000000000..6447ec553a8 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/ECB164A45A1D5C5078508A9869DF6DB84DEA543B.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key deleted file mode 100644 index 5df7b4a5953..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F0117468BE801ED4B81972E159A98FDD4814DCEC.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key deleted file mode 100644 index 03daf80975b..00000000000 Binary files a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4C5EFD5779BE892CAFD5B721D68DED677C9B151.key and /dev/null differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4E86D61A71E9CE6B0DBC65C5121846E542913B9.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4E86D61A71E9CE6B0DBC65C5121846E542913B9.key new file mode 100644 index 00000000000..a95f02bd3ab Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4E86D61A71E9CE6B0DBC65C5121846E542913B9.key differ diff --git a/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/FE38C61A8DB32297C7C3C18E7A837D7B70263BC7.key b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/FE38C61A8DB32297C7C3C18E7A837D7B70263BC7.key new file mode 100644 index 00000000000..ad4078fefd2 Binary files /dev/null and b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/FE38C61A8DB32297C7C3C18E7A837D7B70263BC7.key differ diff --git a/test/lisp/gnus/mml-sec-resources/pubring.gpg b/test/lisp/gnus/mml-sec-resources/pubring.gpg index 6bd169963df..579ca74999d 100644 Binary files a/test/lisp/gnus/mml-sec-resources/pubring.gpg and b/test/lisp/gnus/mml-sec-resources/pubring.gpg differ diff --git a/test/lisp/gnus/mml-sec-resources/secring.gpg b/test/lisp/gnus/mml-sec-resources/secring.gpg index b323c072c04..005f9485ae6 100644 Binary files a/test/lisp/gnus/mml-sec-resources/secring.gpg and b/test/lisp/gnus/mml-sec-resources/secring.gpg differ diff --git a/test/lisp/gnus/mml-sec-resources/trustdb.gpg b/test/lisp/gnus/mml-sec-resources/trustdb.gpg index 09ebd8db114..132c0bb71cd 100644 Binary files a/test/lisp/gnus/mml-sec-resources/trustdb.gpg and b/test/lisp/gnus/mml-sec-resources/trustdb.gpg differ diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index f308a617645..e4e607b70e6 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -199,7 +199,7 @@ In both cases, the first key is customized for signing and encryption." (let* ((mml-secure-key-preferences '((OpenPGP (sign) (encrypt)) (CMS (sign) (encrypt)))) (pcontext (epg-make-context 'OpenPGP)) - (pkey (epg-list-keys pcontext "C3999CF1268DBEA2")) + (pkey (epg-list-keys pcontext "2FAF8726121EB3C6")) (scontext (epg-make-context 'CMS)) (skey (epg-list-keys scontext "0x479DC6E2"))) (mml-secure-cust-record-keys pcontext 'encrypt "sub@example.org" pkey) @@ -259,17 +259,17 @@ In both cases, the first key is customized for signing and encryption." (should-not (mml-secure-check-sub-key context (car keys5) 'sign)) ;; The next key has multiple subkeys. - ;; 42466F0F is valid sign subkey, 501FFD98 is expired - (should (mml-secure-check-sub-key context (car keys6) 'sign "42466F0F")) + ;; 167C1C27A9D25305 is valid sign subkey, 2DD796DBDAC43424 is expired + (should (mml-secure-check-sub-key context (car keys6) 'sign "167C1C27A9D25305")) (should-not - (mml-secure-check-sub-key context (car keys6) 'sign "501FFD98")) - ;; DC7F66E7 is encrypt subkey + (mml-secure-check-sub-key context (car keys6) 'sign "2DD796DBDAC43424")) + ;; 8D850AA2B34936F9 is encrypt subkey (should - (mml-secure-check-sub-key context (car keys6) 'encrypt "DC7F66E7")) + (mml-secure-check-sub-key context (car keys6) 'encrypt "8D850AA2B34936F9")) (should-not - (mml-secure-check-sub-key context (car keys6) 'sign "DC7F66E7")) + (mml-secure-check-sub-key context (car keys6) 'sign "8D850AA2B34936F9")) (should-not - (mml-secure-check-sub-key context (car keys6) 'encrypt "42466F0F")) + (mml-secure-check-sub-key context (car keys6) 'encrypt "167C1C27A9D25305")) ;; The final key is just a public key. (should (mml-secure-check-sub-key context (car keys7) 'encrypt)) @@ -305,9 +305,9 @@ In both cases, the first key is customized for signing and encryption." ;; Expired key should not be usable. ;; Will fail for Ma Gnus v0.14 and earlier. - ;; sign@example.org has the expired subkey 0x501FFD98. + ;; sign@example.org has the expired subkey 0x2DD796DBDAC43424. (should-not - (mml-secure-find-usable-keys context "0x501FFD98" 'sign)) + (mml-secure-find-usable-keys context "0x2DD796DBDAC43424" 'sign)) (should (mml-secure-find-usable-keys context "no-exp@example.org" 'encrypt)) @@ -355,16 +355,16 @@ In both cases, the first key is customized for signing and encryption." ;; Search works with key IDs, with and without prefix "0x". (should (= 1 (length (mml-secure-find-usable-keys - context "A142FD84" 'encrypt)))) + context "CA9EA5175C9043FB" 'encrypt)))) (should (= 1 (length (mml-secure-find-usable-keys - context "0xA142FD84" 'encrypt)))) + context "0xCA9EA5175C9043FB" 'encrypt)))) (should (= 0 (length (mml-secure-find-usable-keys - context "A142FD84" 'sign)))) + context "CA9EA5175C9043FB" 'sign)))) (should (= 0 (length (mml-secure-find-usable-keys - context "0xA142FD84" 'sign)))) + context "0xCA9EA5175C9043FB" 'sign)))) )))) (ert-deftest mml-secure-select-preferred-keys-1 () @@ -373,7 +373,7 @@ In both cases, the first key is customized for signing and encryption." (mml-secure-test-fixture (lambda () (let ((context (epg-make-context 'OpenPGP))) - (should (equal "832F3CC6518D37BC658261B802372A42CA6D40FB" + (should (equal "0281C7D97E90771C0D9A61BFA049C1E9179C086B" (mml-secure-fingerprint (car (mml-secure-select-preferred-keys context '("no-exp@example.org") 'encrypt))))))))) @@ -413,18 +413,18 @@ In both cases, the first key is customized for signing and encryption." (let ((context (epg-make-context 'OpenPGP)) (mml-secure-key-preferences '((OpenPGP (sign) (encrypt)) (CMS (sign) (encrypt))))) - ;; sub@example.org has two keys (268DBEA2, AE31D471). + ;; sub@example.org has two keys (2FAF8726121EB3C6, 8E7FEE76BB1FB195). ;; Normal preference works. (mml-secure-cust-record-keys - context 'encrypt "sub@example.org" (epg-list-keys context "268DBEA2")) + context 'encrypt "sub@example.org" (epg-list-keys context "2FAF8726121EB3C6")) (should (mml-secure-select-preferred-keys context '("sub@example.org") 'encrypt)) (mml-secure-cust-remove-keys context 'encrypt "sub@example.org") - ;; Fake preference for expired (unrelated) key CE15FAE7, + ;; Fake preference for expired (unrelated) key 22F24E21C5010683, ;; results in error (and automatic removal of outdated preference). (mml-secure-cust-record-keys - context 'encrypt "sub@example.org" (epg-list-keys context "CE15FAE7")) + context 'encrypt "sub@example.org" (epg-list-keys context "22F24E21C5010683")) (should-error (mml-secure-select-preferred-keys context '("sub@example.org") 'encrypt)) (should-not @@ -438,8 +438,8 @@ In both cases, the first key is customized for signing and encryption." (lambda () (let ((pcontext (epg-make-context 'OpenPGP)) (scontext (epg-make-context 'CMS)) - (pkeys '("1E6BFA973D9E3103B77FD399C3999CF1268DBEA2" - "14632ECAB9E227369C8DD97BF7E79AB7AE31D471")) + (pkeys '("4D661F67B8BC4F7F1C53C2232FAF8726121EB3C6" + "EB67A6310389C9AE8A5695908E7FEE76BB1FB195")) (skeys '("0x5F88E9FC" "0x479DC6E2")) (mml-secure-key-preferences '((OpenPGP (sign) (encrypt)) (CMS (sign) (encrypt))))) @@ -456,17 +456,17 @@ In both cases, the first key is customized for signing and encryption." pcontext 'sign "sub@example.org"))) (should (= 2 (length p-e-fprs))) (should (= 2 (length p-s-fprs))) - (should (member "1E6BFA973D9E3103B77FD399C3999CF1268DBEA2" p-e-fprs)) - (should (member "14632ECAB9E227369C8DD97BF7E79AB7AE31D471" p-e-fprs)) - (should (member "1E6BFA973D9E3103B77FD399C3999CF1268DBEA2" p-s-fprs)) - (should (member "14632ECAB9E227369C8DD97BF7E79AB7AE31D471" p-s-fprs))) + (should (member "4D661F67B8BC4F7F1C53C2232FAF8726121EB3C6" p-e-fprs)) + (should (member "EB67A6310389C9AE8A5695908E7FEE76BB1FB195" p-e-fprs)) + (should (member "4D661F67B8BC4F7F1C53C2232FAF8726121EB3C6" p-s-fprs)) + (should (member "EB67A6310389C9AE8A5695908E7FEE76BB1FB195" p-s-fprs))) ;; Duplicate record does not change anything. (mml-secure-cust-record-keys pcontext 'encrypt "sub@example.org" - (epg-list-keys pcontext "1E6BFA973D9E3103B77FD399C3999CF1268DBEA2")) + (epg-list-keys pcontext "4D661F67B8BC4F7F1C53C2232FAF8726121EB3C6")) (mml-secure-cust-record-keys pcontext 'sign "sub@example.org" - (epg-list-keys pcontext "1E6BFA973D9E3103B77FD399C3999CF1268DBEA2")) + (epg-list-keys pcontext "4D661F67B8BC4F7F1C53C2232FAF8726121EB3C6")) (let ((p-e-fprs (mml-secure-cust-fpr-lookup pcontext 'encrypt "sub@example.org")) (p-s-fprs (mml-secure-cust-fpr-lookup @@ -524,10 +524,10 @@ Pass optional INTERACTIVE to mml-secure-test-mail-fixture." (concat "Good signature from " (if (eq protocol 'CMS) "0E58229B80EE33959FF718FEEF25402B479DC6E2" - "02372A42CA6D40FB")) + "A049C1E9179C086B")) gnus-info))) (dolist (fpr signer-fprs nil) - ;; OpenPGP: "Good signature from 02372A42CA6D40FB No Expiry (trust undefined) created ..." + ;; OpenPGP: "Good signature from A049C1E9179C086B No Expiry (trust undefined) created ..." ;; S/MIME: "Good signature from D06AA118653CC38E9D0CAF56ED7A2135E1582177 /CN=No Expiry (trust full) ..." (should (string-match-p (concat "Good signature from " @@ -586,7 +586,7 @@ In this test, the single matching key is chosen automatically." ;; no-exp@example.org with single encryption key (mml-secure-test-en-decrypt method "no-exp@example.org" "sub@example.org" nil t - (list (cons "02372A42CA6D40FB" "ED7A2135E1582177"))))) + (list (cons "A049C1E9179C086B" "ED7A2135E1582177"))))) (ert-deftest mml-secure-en-decrypt-2 () "Encrypt message; then decrypt and test for expected result. @@ -600,7 +600,7 @@ In this test, the encryption key needs to fixed among multiple ones." (dolist (method (enc-standards) nil) (mml-secure-test-en-decrypt method "sub@example.org" "no-exp@example.org" nil t - (list (cons "C3999CF1268DBEA2" "EF25402B479DC6E2"))))))) + (list (cons "2FAF8726121EB3C6" "EF25402B479DC6E2"))))))) (ert-deftest mml-secure-en-decrypt-3 () "Encrypt message; then decrypt and test for expected result. @@ -619,8 +619,8 @@ In this test, encrypt-to-self variables are set to t." (dolist (method (enc-standards) nil) (mml-secure-test-en-decrypt method "sub@example.org" "no-exp@example.org" nil t - (list (cons "C3999CF1268DBEA2" "EF25402B479DC6E2") - (cons "02372A42CA6D40FB" "ED7A2135E1582177")))))))) + (list (cons "2FAF8726121EB3C6" "EF25402B479DC6E2") + (cons "A049C1E9179C086B" "ED7A2135E1582177")))))))) (ert-deftest mml-secure-en-decrypt-4 () "Encrypt message; then decrypt and test for expected result. @@ -628,14 +628,14 @@ In this test, encrypt-to-self variables are set to lists." (skip-unless (test-conf)) ;; Send from sub@example.org, which has two keys; encrypt to both. (let ((mml-secure-openpgp-encrypt-to-self - '("C3999CF1268DBEA2" "F7E79AB7AE31D471")) + '("2FAF8726121EB3C6" "8E7FEE76BB1FB195")) (mml-secure-smime-encrypt-to-self '("EF25402B479DC6E2" "4035D59B5F88E9FC"))) (dolist (method (enc-standards) nil) (mml-secure-test-en-decrypt method "no-exp@example.org" "sub@example.org" nil t - (list (cons "C3999CF1268DBEA2" "EF25402B479DC6E2") - (cons "F7E79AB7AE31D471" "4035D59B5F88E9FC")))))) + (list (cons "2FAF8726121EB3C6" "EF25402B479DC6E2") + (cons "8E7FEE76BB1FB195" "4035D59B5F88E9FC")))))) (ert-deftest mml-secure-en-decrypt-sign-1-1-single () "Sign and encrypt message; then decrypt and test for expected result. @@ -672,7 +672,7 @@ In this test, just multiple encryption and signing keys may be available." (mml-secure-smime-sign-with-sender t)) ;; Now use both keys to sign. The customized one via sign-with-sender, ;; the other one via the following setting. - (let ((mml-secure-openpgp-signers '("F7E79AB7AE31D471")) + (let ((mml-secure-openpgp-signers '("8E7FEE76BB1FB195")) (mml-secure-smime-signers '("0x5F88E9FC"))) (dolist (method (enc-sign-standards) nil) (mml-secure-test-en-decrypt @@ -690,7 +690,7 @@ In this test, just multiple encryption and signing keys may be available." (let ((mml-secure-openpgp-sign-with-sender nil) (mml-secure-smime-sign-with-sender nil) (mml-secure-openpgp-signers - '("F7E79AB7AE31D471" "C3999CF1268DBEA2")) + '("8E7FEE76BB1FB195" "2FAF8726121EB3C6")) (mml-secure-smime-signers '("0x5F88E9FC" "0x479DC6E2"))) (dolist (method (enc-sign-standards) nil) (mml-secure-test-en-decrypt @@ -709,7 +709,7 @@ In this test, lists of encryption and signing keys are customized." (scontext (epg-make-context 'CMS)) (mml-secure-openpgp-sign-with-sender t) (mml-secure-smime-sign-with-sender t)) - (dolist (key '("F7E79AB7AE31D471" "C3999CF1268DBEA2") nil) + (dolist (key '("8E7FEE76BB1FB195" "2FAF8726121EB3C6") nil) (mml-secure-cust-record-keys pcontext 'encrypt "sub@example.org" (epg-list-keys pcontext key)) (mml-secure-cust-record-keys @@ -745,8 +745,8 @@ Use sign-with-sender and encrypt-to-self." (dolist (method (enc-sign-standards) nil) (mml-secure-test-en-decrypt method "sub@example.org" "no-exp@example.org" 1 t - (list (cons "C3999CF1268DBEA2" "EF25402B479DC6E2") - (cons "02372A42CA6D40FB" "ED7A2135E1582177")))) + (list (cons "2FAF8726121EB3C6" "EF25402B479DC6E2") + (cons "A049C1E9179C086B" "ED7A2135E1582177")))) )))) (ert-deftest mml-secure-sign-verify-1 () @@ -765,7 +765,7 @@ Use sign-with-sender and encrypt-to-self." ;; From sub@example.org, sign with two keys; ;; sign-with-sender and one from signers-variable: - (let ((mml-secure-openpgp-signers '("02372A42CA6D40FB")) + (let ((mml-secure-openpgp-signers '("A049C1E9179C086B")) (mml-secure-smime-signers '("D06AA118653CC38E9D0CAF56ED7A2135E1582177"))) (mml-secure-test-en-decrypt @@ -781,7 +781,7 @@ With Ma Gnus v0.14 and earlier a signature would be created with a wrong key." (lambda () (let ((with-smime nil) (mml-secure-openpgp-sign-with-sender nil) - (mml-secure-openpgp-signers '("501FFD98"))) + (mml-secure-openpgp-signers '("2DD796DBDAC43424"))) (dolist (method (sign-standards) nil) (mml-secure-test-en-decrypt method "no-exp@example.org" "sign@example.org" 1 nil)