commit ed1401c64d2747768fabf33ac42ff92d84555dce (HEAD, refs/remotes/origin/master) Merge: 87301f2623 5f8849425c Author: Stefan Kangas Date: Fri Oct 7 06:30:21 2022 +0200 Merge from origin/emacs-28 5f8849425c Fix typo in `(emacs) Lisp Doc' f0a06364fb Fix references to 'default-indent-new-line' commit 87301f262357c8003fe1a02b58bfcc9dc9d82a14 Author: Michael Albinus Date: Thu Oct 6 22:18:21 2022 +0200 Better support for remote file names in dired * lisp/dired.el (dired-make-relative): Expand DIR anyway, because it could also be an abbreviated remote file name. (Bug#58300) diff --git a/lisp/dired.el b/lisp/dired.el index 96b580d576..f9a7743139 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2953,11 +2953,7 @@ Optional arg GLOBAL means to replace all matches." If DIR is omitted or nil, it defaults to `default-directory'. If FILE is not in the directory tree of DIR, return FILE unchanged." - (or dir (setq dir default-directory)) - ;; This case comes into play if default-directory is set to - ;; use ~. - (if (and (> (length dir) 0) (= (aref dir 0) ?~)) - (setq dir (expand-file-name dir))) + (setq dir (expand-file-name (or dir default-directory))) (if (string-match (concat "^" (regexp-quote dir)) file) (substring file (match-end 0)) file)) commit 8c8a54dd23c90f108f340f015e8cd91ccdb9cc94 Author: Manuel Giraud Date: Thu Oct 6 16:03:34 2022 +0200 ; * lisp/battery.el (battery-bsd-apm): No need for `executable-find'. diff --git a/lisp/battery.el b/lisp/battery.el index a874f0640e..8de80109c6 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -938,16 +938,14 @@ The following %-sequences are provided: %t Remaining time (to charge or discharge) in the form `h:min'" (let* ((os-name (car (split-string ;; FIXME: Can't we use something like `system-type'? - (battery--call-process-to-string - (executable-find "uname"))))) + (battery--call-process-to-string "uname")))) (apm-flag (pcase os-name ("OpenBSD" "mP") ("FreeBSD" "st") (_ "ms"))) (apm-args (concat "-abl" apm-flag)) (apm-output (split-string - (battery--call-process-to-string - (executable-find "apm") apm-args))) + (battery--call-process-to-string "apm" apm-args))) (indices (pcase os-name ;; FreeBSD's manpage documents that multiple ;; outputs are ordered by "the order in which commit 0c65c9dfb3e1133a16dacd941b2a3cfb892e148a Author: Arash Esbati Date: Thu Oct 6 19:45:44 2022 +0200 Pass correct environment name to `reftex-label' * lisp/textmodes/tex-mode.el (latex-block-body-alist): Pass "figure" to `reftex-label' when inserting a figure float. (bug#58329) diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index 6dc2865dd9..bb8ea0d942 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1557,7 +1557,7 @@ a skeleton (see `skeleton-insert').") '(if (and (boundp 'reftex-mode) reftex-mode) (reftex-label "table")) \n _) ("figure" nil > _ \n "\\caption{" > (skeleton-read "Caption: ") "}" > \n - '(if (and (boundp 'reftex-mode) reftex-mode) (reftex-label "table")))) + '(if (and (boundp 'reftex-mode) reftex-mode) (reftex-label "figure")))) "Skeleton element to use for the body of particular environments. Every element of the list has the form (NAME . SKEL-ELEM) where NAME is the name of the environment and SKEL-ELEM is an element to use in commit d188013737e352289cf60d58d747ead5407ef042 Author: Lars Ingebrigtsen Date: Thu Oct 6 14:56:47 2022 +0200 etc/NEWS: Fix typo in seq-keep entry. diff --git a/etc/NEWS b/etc/NEWS index 536c7aa319..88b1431d6a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3256,8 +3256,8 @@ given predicate in the specified sequence. +++ ** New function 'seq-keep'. -This is like 'seq-map', but removes all non-nil results from the -returned list. +This is like 'seq-map', but removes all nil results from the returned +list. ** Themes commit 9a529537e3e6ba265594362f188032e12a6520ab Author: Justus Winter Date: Wed Oct 5 12:36:39 2022 +0200 Replace aging OpenPGP artifacts in gnus' mml-sec tests. This replaces the old OpenPGPv4 keys that are used in the test suite with more modern OpenPGPv4 keys. Having old cryptographic artifacts in the test suite presents a problem once the old algorithms are rejected by contemporary implementations (bug#58301). 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 0000000000..6f1e145295 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0062E2DBC6D6848AE88BCE181CC1938F2FAC816C.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40C5151DC16303D3BD25F10C092E411CC3D65F7DF30DD8DDBDB17771EED64F8874#) + (d #7AA2EEE8EC08C2B41C4AAD9484D2ED8F6C630392892322827901B37EE3973E68#) + )) +Created: 20121130T230715 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 58fd0b5edb..0000000000 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 0000000000..cdc19ed266 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/052E3324B4811A197A1DE922671AA6ABE475025E.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #40AB5C863639D2154343F2196F43F95CCFAE91203324A0C63019EDA7942EA23E1F#) + (d #692D35D0062BE19EA22D92D7B58F8FAC5E1ACCBA78FE6260ADDDF987D2923A86#) + )) +Created: 20150822T122925 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 0000000000..5a64f9f23e --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/066DBED74BA05B5AA1E2A6E4634EF6F62C0D7A5F.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #402C67E839BFBF7BE2095CA2E9502482C8E8314936689E922B9EF870F0F3F4944F#) + (d #225DF7626A9308083437959FFDF825AE05919CB92670D1E22B2C6A2FB0EAE7A4#) + )) +Created: 20101231T230030 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 0000000000..995b93a4fc --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/0B0D8E451BFADF816524AF5E185EBF3DED48CA00.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #40127BA3ECD3C22145A892CC9A8EF12BBF91537B2180F54CBD22CB2696B7A7C4EA#) + (d #8CF76D6F3FD2893E87B08AC9A9E56419DB7D10BEC5F8AC4600516DC370E97DAB#) + )) +Created: 20111231T230004 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 62f4ab25a6..0000000000 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 0000000000..42773a1d96 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/1967CB6C7B1C00996FCFF5930C3467D3D4FB702C.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #40D900D660C533BB480921CC5455679E9AD53C8BA2240A8946CC07759CAC14ADD5#) + (d #B568C991BB392303AF680093C87DF54B07288EA6D1642567D574A0FFA235B15B#) + )) +Created: 20121231T230003 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 2a8ce135fb..0000000000 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 9f8de71c5e..0000000000 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 6e4a4e548f..0000000000 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 0000000000..c4941533f4 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/2C9A99AF2FB073D3328B0F995BD6DE74616A6CC2.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #4043E90064F42A73C20C5D3984A355F5DA2CAD5218E512B9A4038E0ACDBA237818#) + (d #02A2BE84BCCF0EB82D81BF991013AC77D0F8325D8FB3B98511799844DC106618#) + )) +Created: 20111230T230147 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 0000000000..6fbc08d06d --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/3250B5BE67E704F82BC9AAE00EC8A0CAC8C2A94F.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40C5CE487C55EC9735F736D24AA11A66E05F9BBCE52EBAE5671B858585BF36E12D#) + (d #7DE9D5E8209B9F7E28A0C39F53FDD18125DDDEAB6D7FBD8A8D8DB2AEDE990330#) + )) +Created: 20150822T113710 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 cff58edaa8..0000000000 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 14af8662f7..0000000000 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 207a7237d3..0000000000 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 0000000000..76418968b7 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5294CDB62DB28FBB486DE077DAF248FB32BE286A.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #400F656F4251142032FB4C989B33F2ED84E7673BF6D2DDA34EB936839977BC1DBE#) + (d #12F8EC3BD83533A35D9ABE9A9100E9A41C68E4BF9247552409259F365C913D03#) + )) +Created: 20150822T113710 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 85ca78da04..0000000000 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 0000000000..89c2fb779d --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/5B2B6633E89C0BD58A0FA2C785A31EAA96278695.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #403C440DA39CEB741E321784F06DB254552919F71B20EF9ED031F0FA02D6D5F661#) + (d #4163D84B6D1B3241A23A03B1BACA8697766C8AA1A964676E7B15C84DFF9215B0#) + )) +Created: 20141121T150116 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 0000000000..955ae5a046 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/61F5836DA69D9F63059D2665451F18E4346DF43A.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #4006D1FF44AAE3A141CFC2018E7DDF1F97311B4939768E0F0BC7EE19150DB11D05#) + (d #2E1202F780E0C11F3F99176CBF786538D98465B1EC432E4D70CDFEA307012667#) + )) +Created: 20141118T190135 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 79f3cd2b84..0000000000 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 0000000000..e5e07e6548 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/64CA92780975EEB798D2083FF25AFD43A4033DB7.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #4089CBD8F3505333F4366B6CEC9C77984501D01A656E3835FE5E48AC68C485448D#) + (d #892D99E44F5DF2DE2E78ED7B92D321422876125ED53159C80EDE105058EBA119#) + )) +Created: 20111230T230130 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 2b464f0ccb..0000000000 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 28a07668b2..0000000000 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 0000000000..4df0858b89 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/7A788436224049A2FE1E446E16B70DB012C830BB.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #409BA575D98C4F4F414AFF624CE0E63882099BDEA95261963C9A0C1185D2D5261C#) + (d #62A2816B08C1489F5978E36725E3A1D844EA5CD0DD95FBD64208ABBD809DDE50#) + )) +Created: 20141118T185800 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 137659693b..0000000000 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 c99824ccd4..0000000000 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 0000000000..d1faca4208 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/8865328E25351B0D7697D4156A13497174F999D5.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40BBF4FB0A5BD7D8C29C1FC6DF99A14930805025C9B8161535913F7B9486049C69#) + (d #6AB812F3623F8D8F7E20DC5072D765655EFD719DDC36A0CE38336C26D7466D40#) + )) +Created: 20121130T230051 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 0000000000..711b4994cf --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/9504643B1FB8AAC7529134D1565DF8B4ECA01E35.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40E940D65F4BEC8205787968C2BD5B8BBAA8CF49A7ED1A2F0216E1CD595E363243#) + (d #5E90072772C99862227F8A8335C71DA603A3CE8E8C84F82626DD72CE6AF91950#) + )) +Created: 20101231T230030 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 ca12840895..0000000000 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 0000000000..4d8a2da326 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/A6BC0634D18962998AB53A0134DD2AD0DC4E0782.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #401619EB6E565EA32E569C4AB914A9631288FD0E01802835AD00362FDACC90A171#) + (d #71C77142D31B30081D28CD6EF9897B8808527FF1E511DF6EEF6ED23FF49C64B8#) + )) +Created: 20120101T230044 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 06adc06c42..0000000000 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 0000000000..52e1aaa9ba --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/BCFF2771AD5F49BEC185CDED47EC47D15550CB93.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #404CD8B5371C0868C770EC91255E5703812174BED5AD019C58C0BAE9DA0383EB67#) + (d #6C05D0EFE8281C1D22A7E652DCCF33FF24C4DB7291D1B772FAE469D95BC4D81E#) + )) +Created: 20150822T111645 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 cf9a60d233..0000000000 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 0000000000..2c491e5361 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/C36C6A8B40A2179CFE83CB0C2827358AB171CDFD.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #404B32D4946068A43D436843191272244F5FD661A624E2F3BAAA5B48158C14C12A#) + (d #6FD7F940800F8749B7709638BC020B8BA6CD7072967D9E456A39C4FCF2C09798#) + )) +Created: 20111230T230130 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 0ed35172fe..0000000000 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 9061f67512..0000000000 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 89f6013100..0000000000 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 0000000000..5e431d38a8 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/CF723A68027A82B538F04BF4A2A1323D1B3E095C.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40D5985FA4E3038AD26D8685213A0ADDBB87A065B228D7D2853572FE9716ABD813#) + (d #42441AEA366A281B481E1993A0FECA94B487AE2C13734704797131C8F3CACB68#) + )) +Created: 20150822T111645 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 0000000000..8ed162c023 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/D6A2C195DEBA3506F0ECFBE3DDD7C57F6913DC7C.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #40B1F1895AB187AC68A375C6604BB75F1B995BD9C36F14BAC8115F7A4E7E26F6EB#) + (d #7DDE136B2995E97E279A7CF8D193468742D56451D70C8EA8DEAE69BDEBFECBA2#) + )) +Created: 20141118T185800 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 0000000000..969c2ec690 --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/DB8C922A471E08FAF083EC2465AFB4063904C282.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40ACCC6083DE0BE9E0CD37E47B305B0AD7611AA100BD7D0BBDA489489BB0A96B10#) + (d #4A015D5FF823AD615F618117FD465FD515D8A6F6D1788546E46E5E2F68CA8578#) + )) +Created: 20111231T230214 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 0000000000..1e4cef029f --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/E0C3163E69C57319C6038F9EBE14F5D55DE553F7.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q + #40E67DD44B95A0B37286E0B7812C6AE59FD37B487323496D2FD02ADF184722EF3A#) + (d #55AA402F49A1896142FC1E3311C5FC734820301ADE06D1F339C8DDF0351FAC20#) + )) +Created: 20141118T190135 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 41dac37574..0000000000 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 0000000000..6447ec553a --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/ECB164A45A1D5C5078508A9869DF6DB84DEA543B.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #40964BF2C5B3BE05C4F82CCC49BA0A40B090AB03C9A4076B096115D1C61A47C470#) + (d #1ECC4B3E224D9A07FDA2B3B041729949B02F86F8284688D6E640D64B138FECE0#) + )) +Created: 20141121T150116 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 5df7b4a595..0000000000 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 03daf80975..0000000000 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 0000000000..a95f02bd3a --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/F4E86D61A71E9CE6B0DBC65C5121846E542913B9.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #4017C963514FEF755C31DA3805DA2C4855F3E335048E3BD91038FA79B743FC1993#) + (d #5CDC629D6C26FD0E943792EFF739A5E633DCF506E3C587F58806D59ED346F631#) + )) +Created: 20111231T230214 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 0000000000..ad4078fefd --- /dev/null +++ b/test/lisp/gnus/mml-sec-resources/private-keys-v1.d/FE38C61A8DB32297C7C3C18E7A837D7B70263BC7.key @@ -0,0 +1,5 @@ +Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q + #400D3537C332AF3DA91B8A186A8294CB663D8FABCBE26CD57255AEB3EFA4F4A49A#) + (d #978A174337FDA5815C221F379BDF657B90E779C9C5E085DE8160BABA695749C5#) + )) +Created: 20111231T230149 diff --git a/test/lisp/gnus/mml-sec-resources/pubring.gpg b/test/lisp/gnus/mml-sec-resources/pubring.gpg index 6bd169963d..579ca74999 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 b323c072c0..005f9485ae 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 09ebd8db11..132c0bb71c 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 f308a61764..e4e607b70e 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) commit 8352cf53bd433b9144a7e1bd2210930a6eadd690 Author: Justus Winter Date: Fri Sep 16 12:24:26 2022 +0200 Replace aging OpenPGP artifacts in the package-resources tests. This replaces the old OpenPGPv4 key that is used in the test suite with a more modern OpenPGPv4 key. The key is the Alice key from https://datatracker.ietf.org/doc/draft-bre-openpgp-samples/. All cryptographic artifacts in the test suite are updated accordingly. Having old cryptographic artifacts in the test suite presents a problem once the old algorithms are rejected by contemporary implementations. diff --git a/test/lisp/emacs-lisp/package-resources/key.pub b/test/lisp/emacs-lisp/package-resources/key.pub index 99965723ba..241051067f 100644 --- a/test/lisp/emacs-lisp/package-resources/key.pub +++ b/test/lisp/emacs-lisp/package-resources/key.pub @@ -1,17 +1,14 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: Alice's OpenPGP certificate -mQGiBGFQyDcRBACmAI6cfY3fM02vb9JtC1BS19boKXbBsDoVrD9qRf8tDFROOpO3 -ZMlbuz+O9Vnljo6Y4WZGnyeWWAMqCditMOfr1cLbux77wSrmAVgZ9exwtGzkmUhM -xcptzKuyod8NuhghXbJgVbfJZ6HlBkk4kiWv98iJQwUBZJfjBUfIv+acjwCg4M2i -Ifu2A3UYl9VqF7qfcDOZudEEAI7V35yfsBDnr9ndKqdGYNw0alX9BEG3KwnAe0fF -O1jDVW12Y/bwnyyrRTrz6o1G8dj7M4XVZQb5PpT9mpNzOSZ6yxqhg+foeJwn2JkD -vyP+kMYU7SZ/tWuMOCdzN95Ki1rf+ti7pLnSMqKx+t3vOWwQbtnsbI6RCLLwETPA -esghA/0X3Dw7cdiE5Xq4TRaPSGViCWP4ekL2KYKqmKv6M/4f2pgFNJY7C+2SIiiP -T62zFlIjs5tF2Df34/M5mh4Vx6E8341r55+XO++kfFWJ5QjLiydRAY6ochG9IFgB -xyBCkCNpiby9PpKyPodedBScdMxIAe4eJR7rG/j9gFC1MypBurQnSm9obm55IFJv -Y2tldHMgPGpvaG5ueS5yb2NrZXRzQGdmeS5vcmc+iHgEExECADgWIQRIVz1DPzm4 -REDIXNtltQG5ACv6lwUCYVDINwIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAK -CRBltQG5ACv6l4iZAKCqldroRYH7vUzVV0Uv1NcDVcpLngCgmEoLVxGLKSwDEXNq -qjRDzDRpReg= -=/l51 +mDMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U +b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE +ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy +MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO +dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4 +OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s +E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb +DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn +0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE= +=iIGO -----END PGP PUBLIC KEY BLOCK----- diff --git a/test/lisp/emacs-lisp/package-resources/key.sec b/test/lisp/emacs-lisp/package-resources/key.sec index 5bbac1226a..af11bec899 100644 --- a/test/lisp/emacs-lisp/package-resources/key.sec +++ b/test/lisp/emacs-lisp/package-resources/key.sec @@ -1,17 +1,16 @@ -----BEGIN PGP PRIVATE KEY BLOCK----- +Comment: Alice's OpenPGP Transferable Secret Key -lQG7BGFQyDcRBACmAI6cfY3fM02vb9JtC1BS19boKXbBsDoVrD9qRf8tDFROOpO3 -ZMlbuz+O9Vnljo6Y4WZGnyeWWAMqCditMOfr1cLbux77wSrmAVgZ9exwtGzkmUhM -xcptzKuyod8NuhghXbJgVbfJZ6HlBkk4kiWv98iJQwUBZJfjBUfIv+acjwCg4M2i -Ifu2A3UYl9VqF7qfcDOZudEEAI7V35yfsBDnr9ndKqdGYNw0alX9BEG3KwnAe0fF -O1jDVW12Y/bwnyyrRTrz6o1G8dj7M4XVZQb5PpT9mpNzOSZ6yxqhg+foeJwn2JkD -vyP+kMYU7SZ/tWuMOCdzN95Ki1rf+ti7pLnSMqKx+t3vOWwQbtnsbI6RCLLwETPA -esghA/0X3Dw7cdiE5Xq4TRaPSGViCWP4ekL2KYKqmKv6M/4f2pgFNJY7C+2SIiiP -T62zFlIjs5tF2Df34/M5mh4Vx6E8341r55+XO++kfFWJ5QjLiydRAY6ochG9IFgB -xyBCkCNpiby9PpKyPodedBScdMxIAe4eJR7rG/j9gFC1MypBugAAn0mvGeJi+oSo -5jXAeXBhRiTyI5WPCuK0J0pvaG5ueSBSb2NrZXRzIDxqb2hubnkucm9ja2V0c0Bn -Znkub3JnPoh4BBMRAgA4FiEESFc9Qz85uERAyFzbZbUBuQAr+pcFAmFQyDcCGwMF -CwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQZbUBuQAr+peImQCgqpXa6EWB+71M -1VdFL9TXA1XKS54AoJhKC1cRiyksAxFzaqo0Q8w0aUXo -=cyQm +lFgEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U +b7O1u10AAP9XBeW6lzGOLx7zHH9AsUDUTb2pggYGMzd0P3ulJ2AfvQ4RtCZBbGlj +ZSBMb3ZlbGFjZSA8YWxpY2VAb3BlbnBncC5leGFtcGxlPoiQBBMWCAA4AhsDBQsJ +CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE64W7X6M6deFelE5j8jFVDE9H444FAl2l +nzoACgkQ8jFVDE9H447pKwD6A5xwUqIDprBzrHfahrImaYEZzncqb25vkLV2arYf +a78A/R3AwtLQvjxwLDuzk4dUtUwvUYibL2sAHwj2kGaHnfICnF0EXEcE6RIKKwYB +BAGXVQEFAQEHQEL/BiGtq0k84Km1wqQw2DIikVYrQrMttN8d7BPfnr4iAwEIBwAA +/3/xFPG6U17rhTuq+07gmEvaFYKfxRB6sgAYiW6TMTpQEK6IeAQYFggAIBYhBOuF +u1+jOnXhXpROY/IxVQxPR+OOBQJcRwTpAhsMAAoJEPIxVQxPR+OOWdABAMUdSzpM +hzGs1O0RkWNQWbUzQ8nUOeD9wNbjE3zR+yfRAQDbYqvtWQKN4AQLTxVJN5X5AWyb +Pnn+We1aTBhaGa86AQ== +=n8OM -----END PGP PRIVATE KEY BLOCK----- diff --git a/test/lisp/emacs-lisp/package-resources/signed/archive-contents.sig b/test/lisp/emacs-lisp/package-resources/signed/archive-contents.sig index b40620a0e8..db3eef9d6f 100644 Binary files a/test/lisp/emacs-lisp/package-resources/signed/archive-contents.sig and b/test/lisp/emacs-lisp/package-resources/signed/archive-contents.sig differ diff --git a/test/lisp/emacs-lisp/package-resources/signed/signed-good-1.0.el.sig b/test/lisp/emacs-lisp/package-resources/signed/signed-good-1.0.el.sig index 1109241160..f6ff8e7af6 100644 Binary files a/test/lisp/emacs-lisp/package-resources/signed/signed-good-1.0.el.sig and b/test/lisp/emacs-lisp/package-resources/signed/signed-good-1.0.el.sig differ diff --git a/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh b/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh index c3e82fd173..30e74156c0 100755 --- a/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh +++ b/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh @@ -25,8 +25,9 @@ TRUSTDB="./trust.db" GPG="gpg --no-default-keyring --trustdb-name $TRUSTDB --keyring $KEYRING --yes" rm $KEYRING -$GPG --full-generate-key -$GPG --export --armor > "../key.pub" -$GPG --export-secret-keys -armor > "../key.sec" +#$GPG --full-generate-key +#$GPG --export --armor > "../key.pub" +#$GPG --export-secret-keys -armor > "../key.sec" +$GPG --import ../key.sec $GPG --detach-sign --sign "./archive-contents" $GPG --detach-sign --sign "./signed-good-1.0.el" commit 40e957c62203ebdd504e0fc330f193106109d8d4 Author: Justus Winter Date: Fri Sep 16 12:24:14 2022 +0200 Replace aging OpenPGP artifacts in the epg tests. This replaces the old OpenPGPv4 key that is used in the test suite with a more modern OpenPGPv4 key. The key is the Alice key from https://datatracker.ietf.org/doc/draft-bre-openpgp-samples/. All cryptographic artifacts in the test suite are updated accordingly. Having old cryptographic artifacts in the test suite presents a problem once the old algorithms are rejected by contemporary implementations. diff --git a/test/lisp/epg-resources/pubkey.asc b/test/lisp/epg-resources/pubkey.asc index c0bf28f620..241051067f 100644 --- a/test/lisp/epg-resources/pubkey.asc +++ b/test/lisp/epg-resources/pubkey.asc @@ -1,20 +1,14 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 +Comment: Alice's OpenPGP certificate -mI0EVRDxCAEEALcScrRmxq5N+Hh+NxPg75RJJdtEi824pwtqMlT/3wG1esmP5gNu -ZIPVaTTSGNZkEzeYdhaLXBUe5qD+RQIQVh+MLt9nisF9nD35imyOrhHwAHnglOPx -GdylH8nQ/tIO5p/lfUlw+iCBlPH7eZHqFJhwP0hJML4PKE8ArWG6RtsxABEBAAG0 -J0pvZSBUZXN0ZXIgKHRlc3Qga2V5KSA8am9lQGV4YW1wbGUuY29tPoi4BBMBAgAi -BQJVEPEIAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAoscCWMvu4GGYO -A/0Zzoc2z/dvAtFVLh4ovKqP2qliQt2qschJHVP30hJnKT7dmJfJl7kz9mXmMfSt -Ym0luYmeSzdeWORM9SygLRYXuDfN6G4ZPJTlsRhgnARhNzNhSx+YlcFh48Z+a5zR -goBMn7DgYVqfU4UteZOSXMlnuA2Z5ao1qgGhVqESSJgU5riNBFUQ8QgBBADacLkK -D0U11nmlsScxPGkrDr0aJPrG8MEaDRnKjHJKNp3XTp1psGBUpWF/ErjQAIu+psFt -LO8owCGsg/vJM7CzTv2dVBRbrZXjIKvdq7HdivosTMaHArQBpEtSO9rmgVHO+jaQ -q/M2oGvNEB86zo3nfTWhOgBiB32m8kttWRiuWQARAQABiJ8EGAECAAkFAlUQ8QgC -GwwACgkQKLHAljL7uBj44AQAkMJRm7VJUryrDKFtfIfytQx/vmyU/cZcVV6IpKqP -KhztgR+QD9czlHvQhz+y3hqtLRShu2Eyf75dNexcUvKs/lS4LIDXg5V7pWSRk9eQ -G403muqR/NGu6+QmUx09rJl72trdaGxNkyHA7Zy7ZDGkcMvQsd3qoSNGsPR5TKes -w7Q= -=NMxb +mDMEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U +b7O1u120JkFsaWNlIExvdmVsYWNlIDxhbGljZUBvcGVucGdwLmV4YW1wbGU+iJAE +ExYIADgCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQTrhbtfozp14V6UTmPy +MVUMT0fjjgUCXaWfOgAKCRDyMVUMT0fjjukrAPoDnHBSogOmsHOsd9qGsiZpgRnO +dypvbm+QtXZqth9rvwD9HcDC0tC+PHAsO7OTh1S1TC9RiJsvawAfCPaQZoed8gK4 +OARcRwTpEgorBgEEAZdVAQUBAQdAQv8GIa2rSTzgqbXCpDDYMiKRVitCsy203x3s +E9+eviIDAQgHiHgEGBYIACAWIQTrhbtfozp14V6UTmPyMVUMT0fjjgUCXEcE6QIb +DAAKCRDyMVUMT0fjjlnQAQDFHUs6TIcxrNTtEZFjUFm1M0PJ1Dng/cDW4xN80fsn +0QEA22Kr7VkCjeAEC08VSTeV+QFsmz55/lntWkwYWhmvOgE= +=iIGO -----END PGP PUBLIC KEY BLOCK----- diff --git a/test/lisp/epg-resources/seckey.asc b/test/lisp/epg-resources/seckey.asc index 4ac7ba4a50..af11bec899 100644 --- a/test/lisp/epg-resources/seckey.asc +++ b/test/lisp/epg-resources/seckey.asc @@ -1,33 +1,16 @@ -----BEGIN PGP PRIVATE KEY BLOCK----- -Version: GnuPG v1 +Comment: Alice's OpenPGP Transferable Secret Key -lQHYBFUQ8QgBBAC3EnK0ZsauTfh4fjcT4O+USSXbRIvNuKcLajJU/98BtXrJj+YD -bmSD1Wk00hjWZBM3mHYWi1wVHuag/kUCEFYfjC7fZ4rBfZw9+Ypsjq4R8AB54JTj -8RncpR/J0P7SDuaf5X1JcPoggZTx+3mR6hSYcD9ISTC+DyhPAK1hukbbMQARAQAB -AAP9Hs9agZTobA5QOksXjt9kwqJ63gePtbwVVNz3AoobaGi39PMkRUCPZwaEEbEo -H/CwsUMV4J5sjVtpef/A8mN4csai7NYp82mbo+dPim4p+SUtBg4Ms8ujGVcQeRQd -1CXtIkixDu6fw4wDtNw03ZyNJOhBOXVTgAyOTSlIz3D+6n8CAMeCqEFBHQIVoQpf -Bza4YvFtJRdfGMTix3u7Cb6y9CHGBok7uUgQAeWnzQvMGTCHc3e8iHGAYBQ88GPF -v1TpiusCAOroRe69Aiid5JMVTjWoJ0SHKd47nIj0gQFiDfa5de0BNq9gYj7JLg+R -EjsJbJN39z+Z9HWjIOCUOIXDvucmM1MB/iNxW1Z8mEMflEYK5rop+PDxwqUbr8uZ -kzogw98ZdmuEuN0bheGWUiJI+0Pd8jb40zlR1KgOEMx1mZchToAJdtybMLQnSm9l -IFRlc3RlciAodGVzdCBrZXkpIDxqb2VAZXhhbXBsZS5jb20+iLgEEwECACIFAlUQ -8QgCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJECixwJYy+7gYZg4D/RnO -hzbP928C0VUuHii8qo/aqWJC3aqxyEkdU/fSEmcpPt2Yl8mXuTP2ZeYx9K1ibSW5 -iZ5LN15Y5Ez1LKAtFhe4N83obhk8lOWxGGCcBGE3M2FLH5iVwWHjxn5rnNGCgEyf -sOBhWp9ThS15k5JcyWe4DZnlqjWqAaFWoRJImBTmnQHYBFUQ8QgBBADacLkKD0U1 -1nmlsScxPGkrDr0aJPrG8MEaDRnKjHJKNp3XTp1psGBUpWF/ErjQAIu+psFtLO8o -wCGsg/vJM7CzTv2dVBRbrZXjIKvdq7HdivosTMaHArQBpEtSO9rmgVHO+jaQq/M2 -oGvNEB86zo3nfTWhOgBiB32m8kttWRiuWQARAQABAAP7B8uNtb/DLvGoRfL+mA0Q -REhgOJ1WpRcU6rvKYNPh8xTkKMvM+EK0nVU/znBedEpXjb0pY1WRT0uvXs2pzY2V -YeaugyKIkdUpPWnyWoEQwI8hFvHOWmU2rNHyXLW0MY7bxcGgqv2XbkL4m7/D6VQS -SR8hQ2CxBbW+9ov6aBMwv/UCAOW89+5xxuzkv48AVraWlMnaU0ggVOf6ht0Qa40+ -+uw2yziNlD403gAAAycoICiB/oqwslx61B2xOHn0laCKrgsCAPNpIsHRlAwWbAsq -uCtfIQxg+C3mPXkqsNTMjeK5NjLNytrmO49NXco36zVEG6q7qz5Zj9d9IPYoGOSa -I+dQZ6sB/RKF5aonR5/e7IHJgc8BG7I0yiya4llE0AB9ghnRI/3uHwnCBnmo/32a -n4+rQkx6vm+rg3JA/09Gi7W4R9SwV+ane4ifBBgBAgAJBQJVEPEIAhsMAAoJECix -wJYy+7gY+OAEAJDCUZu1SVK8qwyhbXyH8rUMf75slP3GXFVeiKSqjyoc7YEfkA/X -M5R70Ic/st4arS0UobthMn++XTXsXFLyrP5UuCyA14OVe6VkkZPXkBuNN5rqkfzR -ruvkJlMdPayZe9ra3WhsTZMhwO2cu2QxpHDL0LHd6qEjRrD0eUynrMO0 -=iCIm +lFgEXEcE6RYJKwYBBAHaRw8BAQdArjWwk3FAqyiFbFBKT4TzXcVBqPTB3gmzlC/U +b7O1u10AAP9XBeW6lzGOLx7zHH9AsUDUTb2pggYGMzd0P3ulJ2AfvQ4RtCZBbGlj +ZSBMb3ZlbGFjZSA8YWxpY2VAb3BlbnBncC5leGFtcGxlPoiQBBMWCAA4AhsDBQsJ +CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE64W7X6M6deFelE5j8jFVDE9H444FAl2l +nzoACgkQ8jFVDE9H447pKwD6A5xwUqIDprBzrHfahrImaYEZzncqb25vkLV2arYf +a78A/R3AwtLQvjxwLDuzk4dUtUwvUYibL2sAHwj2kGaHnfICnF0EXEcE6RIKKwYB +BAGXVQEFAQEHQEL/BiGtq0k84Km1wqQw2DIikVYrQrMttN8d7BPfnr4iAwEIBwAA +/3/xFPG6U17rhTuq+07gmEvaFYKfxRB6sgAYiW6TMTpQEK6IeAQYFggAIBYhBOuF +u1+jOnXhXpROY/IxVQxPR+OOBQJcRwTpAhsMAAoJEPIxVQxPR+OOWdABAMUdSzpM +hzGs1O0RkWNQWbUzQ8nUOeD9wNbjE3zR+yfRAQDbYqvtWQKN4AQLTxVJN5X5AWyb +Pnn+We1aTBhaGa86AQ== +=n8OM -----END PGP PRIVATE KEY BLOCK----- diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index 65aaafd9f1..dca6f33764 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -101,16 +101,15 @@ (ert-deftest epg-decrypt-1 () :expected-result (if (getenv "EMACS_HYDRA_CI") :failed :passed) ; fixme (with-epg-tests (:require-passphrase t) - (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory) - (insert "ignore-mdc-error")) (should (equal "test" (epg-decrypt-string epg-tests-context "\ -----BEGIN PGP MESSAGE----- -Version: GnuPG v2 -jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== -=U8z7 ------END PGP MESSAGE-----"))))) +jA0ECQMCdW8+qtS9Tin/0jUBO1/9Oz69BWPmtFKEeBM62WpFP4o1+bNzdxogdyeg ++WTt292OD0yV85m5UqvLgp4ttVUmAw== +=K5Eh +-----END PGP MESSAGE----- +"))))) (ert-deftest epg-roundtrip-1 () :expected-result (if (getenv "EMACS_HYDRA_CI") :failed :passed) ; fixme @@ -123,7 +122,7 @@ jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== (with-epg-tests (:require-passphrase t :require-public-key t :require-secret-key t) - (let* ((recipients (epg-list-keys epg-tests-context "joe@example.com")) + (let* ((recipients (epg-list-keys epg-tests-context "alice@openpgp.example")) (cipher (epg-encrypt-string epg-tests-context "public key" recipients nil t))) (should (equal "public key" @@ -135,7 +134,7 @@ jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== :require-secret-key t) (let (signature verify-result) (setf (epg-context-signers epg-tests-context) - (epg-list-keys epg-tests-context "joe@example.com")) + (epg-list-keys epg-tests-context "alice@openpgp.example")) (setq signature (epg-sign-string epg-tests-context "signed" t)) (epg-verify-string epg-tests-context signature "signed") (setq verify-result (epg-context-result-for context 'verify)) @@ -148,7 +147,7 @@ jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== :require-secret-key t) (let (signature verify-result) (setf (epg-context-signers epg-tests-context) - (epg-list-keys epg-tests-context "joe@example.com")) + (epg-list-keys epg-tests-context "alice@openpgp.example")) (setq signature (epg-sign-string epg-tests-context "clearsigned" 'clear)) ;; Clearsign signature always ends with a new line. (should (equal "clearsigned\n" @@ -163,7 +162,7 @@ jA0EAwMCE19JBLTvvmhgyRrGGglRbnKkK9PJG8fDwO5ccjysrR7IcdNcnA== :require-secret-key t) (let (signature verify-result) (setf (epg-context-signers epg-tests-context) - (epg-list-keys epg-tests-context "joe@example.com")) + (epg-list-keys epg-tests-context "alice@openpgp.example")) (setq signature (epg-sign-string epg-tests-context "normal signed")) (should (equal "normal signed" (epg-verify-string epg-tests-context signature))) commit 82388dff8ed006cecb65ea7a4afd8667ec44b5e3 Author: Justus Winter Date: Fri Sep 16 12:23:39 2022 +0200 Fix epg's reliance on an implicit GnuPG command. Previously, epg invoked GnuPG without an explicit command to verify signatures. Make that operation explicit. Happily, this aligns how gpg and gpgsm is invoked, so it actually makes the code simpler. diff --git a/lisp/epg.el b/lisp/epg.el index c3c26badbb..ceeb269b07 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -1519,12 +1519,8 @@ If you are unsure, use synchronous version of this function (process-send-eof (epg-context-process context)))) ;; Normal (or cleartext) signature. (if (epg-data-file signature) - (epg--start context (if (eq (epg-context-protocol context) 'CMS) - (list "--verify" "--" (epg-data-file signature)) - (list "--" (epg-data-file signature)))) - (epg--start context (if (eq (epg-context-protocol context) 'CMS) - '("--verify" "-") - '("-"))) + (epg--start context (list "--verify" "--" (epg-data-file signature))) + (epg--start context '("--verify" "-")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) (epg-data-string signature))) commit 07b2e9b9092df57f454386e54491420fb4b5f303 Author: Manuel Giraud Date: Thu Oct 6 14:46:39 2022 +0200 Fix BSD battery mode over TRAMP (bug#58307) * lisp/battery.el (battery--call-process-to-string): Simple wrapper to `call-process' that outputs to a string. (battery-bsd-apm): Use it instead of `shell-command-to-string' (bug#58307). diff --git a/lisp/battery.el b/lisp/battery.el index 72b3dfdae7..a874f0640e 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -914,6 +914,15 @@ The following %-sequences are provided: ;;; `apm' interface for BSD. +;; This function is a wrapper on `call-process' that return the +;; standard output in a string. We are using it instead +;; `shell-command-to-string' because this last one is trying to run +;; PROGRAM on the remote host if the buffer is remote. +(defun battery--call-process-to-string (program &rest args) + (with-output-to-string + (with-current-buffer standard-output + (apply #'call-process program nil t nil args)))) + (defun battery-bsd-apm () "Get APM status information from BSD apm binary. The following %-sequences are provided: @@ -929,13 +938,16 @@ The following %-sequences are provided: %t Remaining time (to charge or discharge) in the form `h:min'" (let* ((os-name (car (split-string ;; FIXME: Can't we use something like `system-type'? - (shell-command-to-string "/usr/bin/uname")))) + (battery--call-process-to-string + (executable-find "uname"))))) (apm-flag (pcase os-name ("OpenBSD" "mP") ("FreeBSD" "st") (_ "ms"))) - (apm-cmd (concat "/usr/sbin/apm -abl" apm-flag)) - (apm-output (split-string (shell-command-to-string apm-cmd))) + (apm-args (concat "-abl" apm-flag)) + (apm-output (split-string + (battery--call-process-to-string + (executable-find "apm") apm-args))) (indices (pcase os-name ;; FreeBSD's manpage documents that multiple ;; outputs are ordered by "the order in which commit e24f276f8a639faeaec516e758996354dd49a5b7 Author: Matt Armstrong Date: Thu Oct 6 14:08:20 2022 +0200 Fix calling `package-reinstall' just after quick initialization. * lisp/emacs-lisp/package.el (package-reinstall): call `package--archives-initialize', just like `package-install' does. This populates `package-alist', and so fixes calling `package-reinstall' as the first thing done after package "quick init" (Bug#53527). diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 4abee9d053..812e1eb0ff 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2436,10 +2436,14 @@ If NOSAVE is non-nil, the package is not removed from "Reinstall package PKG. PKG should be either a symbol, the package name, or a `package-desc' object." - (interactive (list (intern (completing-read - "Reinstall package: " - (mapcar #'symbol-name - (mapcar #'car package-alist)))))) + (interactive + (progn + (package--archives-initialize) + (list (intern (completing-read + "Reinstall package: " + (mapcar #'symbol-name + (mapcar #'car package-alist))))))) + (package--archives-initialize) (package-delete (if (package-desc-p pkg) pkg (cadr (assq pkg package-alist))) 'force 'nosave) commit d9b026d464db2ddce9d85566ee2f67ebe0c7c614 Author: Gerd Möllmann Date: Thu Oct 6 10:18:59 2022 +0200 Add missing staticpro (bug#58327) * src/window.c (init_window_once): staticpro old_selected_window. diff --git a/src/window.c b/src/window.c index 12a212a85a..da80fabe33 100644 --- a/src/window.c +++ b/src/window.c @@ -8213,6 +8213,8 @@ init_window_once (void) minibuf_selected_window = Qnil; staticpro (&minibuf_selected_window); + old_selected_window = Qnil; + staticpro (&old_selected_window); pdumper_do_now_and_after_late_load (init_window_once_for_pdumper); } commit 5f8849425cad71fa173008bcf87b9aec07730dba (refs/remotes/origin/emacs-28) Author: Stefan Kangas Date: Thu Oct 6 09:32:02 2022 +0200 Fix typo in `(emacs) Lisp Doc' * doc/emacs/programs.texi (Lisp Doc): Fix reference to 'eldoc-echo-area-display-truncation-message'. (Bug#58324) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index c746a374b3..9eb11c602d 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1316,8 +1316,8 @@ This abnormal hook holds documentation functions. It acts as a collection of backends for ElDoc. This is what modes should use to register their documentation functions with ElDoc. -@vindex eldoc-display-truncation-message -@item eldoc-display-truncation-message +@vindex eldoc-echo-area-display-truncation-message +@item eldoc-echo-area-display-truncation-message If non-@code{nil} (the default), display a verbose message about how to view a complete documentation (if it has been truncated in the echo area). If @code{nil}, just mark truncated messages with @samp{...}. commit f0a06364fb7a9d40752109855335990ccee0f410 Author: Stefan Kangas Date: Thu Oct 6 09:25:42 2022 +0200 Fix references to 'default-indent-new-line' * doc/emacs/programs.texi (Comment Commands) (Multi-Line Comments): Fix references to 'default-indent-new-line'. (Bug#58325) diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index b2a08fa2cc..c746a374b3 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -970,7 +970,7 @@ Set comment column (@code{comment-set-column}). @item @kbd{C-M-j} @itemx @kbd{M-j} Like @kbd{@key{RET}} followed by inserting and aligning a comment -(@code{comment-indent-new-line}). @xref{Multi-Line Comments}. +(@code{default-indent-new-line}). @xref{Multi-Line Comments}. @item @kbd{M-x comment-region} @itemx @kbd{C-c C-c} (in C-like modes) Add comment delimiters to all the lines in the region. @@ -1065,10 +1065,10 @@ the brace rather than at @code{comment-column}. For full details see @kindex C-M-j @kindex M-j @cindex blank lines in programs -@findex comment-indent-new-line +@findex default-indent-new-line @vindex comment-multi-line If you are typing a comment and wish to continue it to another line, -type @kbd{M-j} or @kbd{C-M-j} (@code{comment-indent-new-line}). This +type @kbd{M-j} or @kbd{C-M-j} (@code{default-indent-new-line}). This breaks the current line, and inserts the necessary comment delimiters and indentation to continue the comment. commit a112e3f017dd9704f44b4913a2c37ad32d3e73bd Author: Gerd Möllmann Date: Thu Oct 6 09:09:04 2022 +0200 Inhibit GC in probably_quit (bug#58042) diff --git a/src/eval.c b/src/eval.c index 7da1d8fb98..8810136c04 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1651,10 +1651,12 @@ process_quit_flag (void) void probably_quit (void) { + specpdl_ref gc_count = inhibit_garbage_collection (); if (!NILP (Vquit_flag) && NILP (Vinhibit_quit)) process_quit_flag (); else if (pending_signals) process_pending_signals (); + unbind_to (gc_count, Qnil); } DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0,