mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-14 09:39:42 +00:00
daa4e0120d
* lisp/gnus/gnus-group.el (features): Use `dlet`. (gnus-tmp-level, gnus-tmp-marked, gnus-tmp-group): Declare vars. (gnus-group-insert-group-line): Bind dynbound vars via `let` rather than as formal args. Bind `number` as dynbound. (gnus-visual, gnus-score-find-score-files-function) (gnus-home-score-file, gnus-apply-kill-hook) (gnus-summary-expunge-below): Declare vars. (gnus-group-restart, gnus-group-list-plus): Fix `interactive` spec since the arg is unused. * lisp/gnus/mail-source.el (mail-source-bind, mail-source-bind-common): Use `dlet` and suppress the warnings about the non-prefixed dynbound vars. (mail-source-set-1): Remove unused var `auth-info`. (mail-source-call-script): Remove unused var `background`. (mail-source-fetch-pop, mail-source-check-pop): Bind pop3 vars with `dlet`. * lisp/gnus/gnus-int.el (mail-source-plugged, gnus-inhibit-demon): Declare vars. (gnus-server-opened, gnus-status-message) (gnus-open-server, gnus-close-server, gnus-request-list) (gnus-finish-retrieve-group-infos, gnus-retrieve-group-data-early) (gnus-request-list-newsgroups, gnus-request-newgroups) (gnus-request-regenerate, gnus-request-compact, gnus-request-group) (gnus-retrieve-groups, gnus-request-post, gnus-request-expunge-group) (gnus-request-scan, gnus-request-update-info, gnus-request-marks) (gnus-request-accept-article, gnus-request-create-group) (gnus-asynchronous-p, gnus-remove-denial): Bind `gnus-command-method` via `let` rather than as formal args. * lisp/gnus/gnus-topic.el (gnus-topic-insert-topic-line): Pass documented vars to eval for `gnus-topic-line-format-spec`. * lisp/gnus/message.el (message-yank-original): Use `cl-progv` rather than `eval` to bind the vars from `message-cite-style`. * lisp/gnus/mml.el (mml-parse-1): Use `apply` instead of `eval`. (gnus-newsgroup-name, gnus-displaying-mime, gnus-newsgroup-name) (gnus-article-prepare-hook, gnus-newsgroup-charset) (gnus-original-article-buffer, gnus-message-buffer) (message-this-is-news, message-this-is-mail): Declare vars. * lisp/gnus/deuglify.el (gnus-outlook-rearrange-article): Remove unused var `cite-marks`. * lisp/gnus/gnus-art.el (ansi-color-context-region): Declare var. (gnus-mime-display-attachment-buttons-in-header): Move declaration before first use. (gnus-mime-display-alternative): Remove unused var `from`. * lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-list): Remove unused var `start` `end`. * lisp/gnus/gnus-cache.el (gnus-article-decode-hook) (nnml-generate-active-function): Declare var. * lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Remove unused var `keywords`. * lisp/gnus/gnus-cloud.el (gnus-cloud-encode-data): Remove unused var `cipher`. (gnus-cloud-ensure-cloud-group): Remove unused var `method`. * lisp/gnus/gnus-delay.el (gnus-delay-article): Remove unused var `days`. * lisp/gnus/gnus-html.el (gnus-html-wash-images): Remove unused vars `tag`, `string`, and `images`. (gnus-html-wash-tags): Remove unused vars `string` and `images`. * lisp/gnus/gnus-msg.el (gnus-msg-mail): Remove unused var `group-name`. (gnus-group-mail, gnus-group-news, gnus-summary-mail-other-window) (gnus-summary-news-other-window): Remove unused vars `group` and `buffer`. (gnus-configure-posting-styles): Remove unused vars `style` and `attribute`. * lisp/gnus/gnus-picon.el (gnus-picon-find-face): Remove unused vars `database`, `directory`, and `instance`. (gnus-picon-transform-newsgroups): Remove unused var `point`. * lisp/gnus/gnus-range.el (gnus-range-difference): Remove unused var `safe`. * lisp/gnus/gnus-score.el (gnus-score-load-file): Remove unused var `score-fn`. * lisp/gnus/gnus-sum.el (message-options-set-recipient): Declare var. * lisp/gnus/gnus-undo.el (gnus-undo): Fix docstring lie. * lisp/gnus/gnus-util.el (print-string-length) (iswitchb-make-buflist-hook): Declare vars. (gnus-emacs-version): Remove unused var `codename`. (gnus-rename-file): Remove unused vars `old-name` and `new-name`. * lisp/gnus/gnus-uu.el (gnus-uu-yenc-article): Remove unused var `start-char`. (gnus-asynchronous): Declare var. * lisp/gnus/mm-partial.el (gnus-displaying-mime): Declare var. (mm-inline-partial): Remove unused var `buffer`. * lisp/gnus/mm-view.el (w3m-force-redisplay, w3m-safe-url-regexp) (gnus-displaying-mime, gnus-original-article-buffer) (gnus-article-prepare-hook): Declare vars. * lisp/gnus/mml-smime.el (mml-smime-epg-encrypt): Remove unused var `boundary`. (mml-smime-epg-verify): Remove unused vars `plain` and `signature-file`. * lisp/gnus/mml1991.el (pgg-text-mode): Declare var. * lisp/gnus/mml2015.el (pgg-text-mode): Declare var. (mml2015-pgg-decrypt): Remove unused var `result`. (mml2015-epg-key-image-to-string): Remove unused var `error`. (mml2015-epg-decrypt): Remove unused var `result`. (mml2015-epg-verify): Remove unused vars `plain` and `signature-file`. * lisp/gnus/nnbabyl.el (nnml-current-directory): Declare var. * lisp/gnus/nndiary.el (nndiary-files): Move declaration before first use. * lisp/gnus/nnfolder.el (nnfolder-request-accept-article): Remove unused var `buf`. * lisp/gnus/nnmail.el (nnmail-parse-active): Remove unused var `err`. * lisp/gnus/nnmairix.el (nnmairix-request-group): Remove unused var `args`. (nnmairix-request-create-group): Remove unused var `info`. (nnmairix-request-list): Remove unused var `folder`. (nnmairix-request-set-mark): Remove unused var `propto`. (nnmairix-request-set-mark): Remove unused vars `number` and `method`. (nnmairix-close-group): Remove unused var `method`. (nnmairix-create-search-group-from-message): Remove unused var `cq`. (nnmairix-create-server-and-default-group): Remove unused var `create`. (nnmairix-purge-old-groups): Remove unused var `folder`. (nnmairix-remove-tick-mark-original-article, nnmairix-get-valid-servers): Remove unused var `cur`. (nnmairix-replace-group-and-numbers): Remove unused var `header`. (nnmairix-goto-original-article): Remove unused var `rval`. (nnmairix-widget-create-query): Remove unused var `allwidgets`. * lisp/gnus/nnmbox.el (nnml-current-directory): Declare var. * lisp/gnus/nnmh.el (nnmh-toplev): Move declaration before first use. (nnmh-request-list-1): Remove unused var `rdir`. * lisp/gnus/nnml.el (nnml-generate-nov-file): Remove unused var `file`. * lisp/gnus/nnrss.el (nnrss-request-article): Remove unused var `post`. (nnrss-request-article): Remove unused var `fn`. (nnrss-check-group): Remove unused var `rdf-ns`. * lisp/gnus/nnweb.el (nnweb-request-article): Remove unused var `active`. (nnweb-google-parse-1): Remove unused var `Score`. * lisp/gnus/spam-stat.el (spam-stat-error-holder): Remove var. (spam-stat-buffer-words-with-scores): Remove unused var `word`. (spam-stat-score-buffer): Remove unused var `spam-stat-error-holder`. (spam-stat-split-fancy): Use `err` instead of `spam-stat-error-holder`. * lisp/gnus/spam-wash.el (spam-wash): Remove unused var `handle`. * lisp/gnus/spam.el (spam-copy-or-move-routine): Remove unused vars `article` and `mark`. (spam-register-routine): Remove unused var `article`. (spam-log-undo-registration): Remove unused var `found`. (spam-ifile-register-with-ifile): Remove unused var `parameters`. (spam-check-stat): Remove unused vars `category` and `return`. (spam-parse-list): Remove unused var `found`. (spam-filelist-register-routine): Remove unused var `from`.
334 lines
10 KiB
EmacsLisp
334 lines
10 KiB
EmacsLisp
;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 1998-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Sascha Lüdecke <sascha@meta-x.de>,
|
|
;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
|
|
;; Keywords: PGP
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(eval-when-compile (require 'mm-util))
|
|
|
|
(require 'mm-encode)
|
|
(require 'mml-sec)
|
|
|
|
(defvar mc-pgp-always-sign)
|
|
|
|
(autoload 'quoted-printable-decode-region "qp")
|
|
(autoload 'quoted-printable-encode-region "qp")
|
|
|
|
(autoload 'mm-decode-content-transfer-encoding "mm-bodies")
|
|
(autoload 'mm-encode-content-transfer-encoding "mm-bodies")
|
|
(autoload 'message-options-get "message")
|
|
(autoload 'message-options-set "message")
|
|
|
|
(require 'mml2015)
|
|
|
|
(defvar mml1991-use mml2015-use
|
|
"The package used for PGP.")
|
|
|
|
(defvar mml1991-function-alist
|
|
'((mailcrypt mml1991-mailcrypt-sign
|
|
mml1991-mailcrypt-encrypt)
|
|
(pgg mml1991-pgg-sign
|
|
mml1991-pgg-encrypt)
|
|
(epg mml1991-epg-sign
|
|
mml1991-epg-encrypt))
|
|
"Alist of PGP functions.")
|
|
|
|
(defvar mml1991-cache-passphrase mml-secure-cache-passphrase
|
|
"If t, cache passphrase.")
|
|
(make-obsolete-variable 'mml1991-cache-passphrase
|
|
'mml-secure-cache-passphrase
|
|
"25.1")
|
|
|
|
(defvar mml1991-passphrase-cache-expiry mml-secure-passphrase-cache-expiry
|
|
"How many seconds the passphrase is cached.
|
|
Whether the passphrase is cached at all is controlled by
|
|
`mml1991-cache-passphrase'.")
|
|
(make-obsolete-variable 'mml1991-passphrase-cache-expiry
|
|
'mml-secure-passphrase-cache-expiry
|
|
"25.1")
|
|
|
|
(defvar mml1991-signers nil
|
|
"A list of your own key ID which will be used to sign a message.")
|
|
|
|
(defvar mml1991-encrypt-to-self nil
|
|
"If t, add your own key ID to recipient list when encryption.")
|
|
|
|
|
|
;;; mailcrypt wrapper
|
|
|
|
(autoload 'mc-sign-generic "mc-toplev")
|
|
|
|
(defvar mml1991-decrypt-function 'mailcrypt-decrypt)
|
|
(defvar mml1991-verify-function 'mailcrypt-verify)
|
|
|
|
(defun mml1991-mailcrypt-sign (_cont)
|
|
(let ((text (current-buffer))
|
|
headers signature
|
|
(result-buffer (get-buffer-create "*GPG Result*")))
|
|
;; Save MIME Content[^ ]+: headers from signing
|
|
(goto-char (point-min))
|
|
(while (looking-at "^Content[^ ]+:") (forward-line))
|
|
(unless (bobp)
|
|
(setq headers (buffer-string))
|
|
(delete-region (point-min) (point)))
|
|
(goto-char (point-max))
|
|
(unless (bolp)
|
|
(insert "\n"))
|
|
(quoted-printable-decode-region (point-min) (point-max))
|
|
(with-temp-buffer
|
|
(setq signature (current-buffer))
|
|
(insert-buffer-substring text)
|
|
(unless (mc-sign-generic (message-options-get 'message-sender)
|
|
nil nil nil nil)
|
|
(unless (> (point-max) (point-min))
|
|
(pop-to-buffer result-buffer)
|
|
(error "Sign error")))
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "\r+$" nil t)
|
|
(replace-match "" t t))
|
|
(quoted-printable-encode-region (point-min) (point-max))
|
|
(set-buffer text)
|
|
(delete-region (point-min) (point-max))
|
|
(if headers (insert headers))
|
|
(insert "\n")
|
|
(insert-buffer-substring signature)
|
|
(goto-char (point-max)))))
|
|
|
|
(declare-function mc-encrypt-generic "ext:mc-toplev"
|
|
(&optional recipients scheme start end from sign))
|
|
|
|
(defun mml1991-mailcrypt-encrypt (_cont &optional sign)
|
|
(let ((text (current-buffer))
|
|
(mc-pgp-always-sign
|
|
(or mc-pgp-always-sign
|
|
sign
|
|
(eq t (or (message-options-get 'message-sign-encrypt)
|
|
(message-options-set
|
|
'message-sign-encrypt
|
|
(or (y-or-n-p "Sign the message? ")
|
|
'not))))
|
|
'never))
|
|
cipher
|
|
(result-buffer (get-buffer-create "*GPG Result*")))
|
|
;; Strip MIME Content[^ ]: headers since it will be ASCII ARMORED
|
|
(goto-char (point-min))
|
|
(while (looking-at "^Content[^ ]+:") (forward-line))
|
|
(unless (bobp)
|
|
(delete-region (point-min) (point)))
|
|
(with-temp-buffer
|
|
(inline (mm-disable-multibyte))
|
|
(setq cipher (current-buffer))
|
|
(insert-buffer-substring text)
|
|
(unless (mc-encrypt-generic
|
|
(or
|
|
(message-options-get 'message-recipients)
|
|
(message-options-set 'message-recipients
|
|
(read-string "Recipients: ")))
|
|
nil
|
|
(point-min) (point-max)
|
|
(message-options-get 'message-sender)
|
|
'sign)
|
|
(unless (> (point-max) (point-min))
|
|
(pop-to-buffer result-buffer)
|
|
(error "Encrypt error")))
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "\r+$" nil t)
|
|
(replace-match "" t t))
|
|
(set-buffer text)
|
|
(delete-region (point-min) (point-max))
|
|
;;(insert "Content-Type: application/pgp-encrypted\n\n")
|
|
;;(insert "Version: 1\n\n")
|
|
(insert "\n")
|
|
(insert-buffer-substring cipher)
|
|
(goto-char (point-max)))))
|
|
|
|
;; pgg wrapper
|
|
|
|
(autoload 'pgg-sign-region "pgg")
|
|
(autoload 'pgg-encrypt-region "pgg")
|
|
|
|
(defvar pgg-default-user-id)
|
|
(defvar pgg-errors-buffer)
|
|
(defvar pgg-output-buffer)
|
|
(defvar pgg-text-mode)
|
|
|
|
(defun mml1991-pgg-sign (_cont)
|
|
(let ((pgg-text-mode t)
|
|
(pgg-default-user-id (or (message-options-get 'mml-sender)
|
|
pgg-default-user-id))
|
|
headers cte)
|
|
;; Don't sign headers.
|
|
(goto-char (point-min))
|
|
(when (re-search-forward "^$" nil t)
|
|
(setq headers (buffer-substring (point-min) (point)))
|
|
(save-restriction
|
|
(narrow-to-region (point-min) (point))
|
|
(setq cte (mail-fetch-field "content-transfer-encoding")))
|
|
(forward-line 1)
|
|
(delete-region (point-min) (point))
|
|
(when cte
|
|
(setq cte (intern (downcase cte)))
|
|
(mm-decode-content-transfer-encoding cte)))
|
|
(unless (pgg-sign-region (point-min) (point-max) t)
|
|
(pop-to-buffer pgg-errors-buffer)
|
|
(error "Encrypt error"))
|
|
(delete-region (point-min) (point-max))
|
|
(insert
|
|
(with-temp-buffer
|
|
(set-buffer-multibyte nil)
|
|
(insert-buffer-substring pgg-output-buffer)
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "\r+$" nil t)
|
|
(replace-match "" t t))
|
|
(when cte
|
|
(mm-encode-content-transfer-encoding cte))
|
|
(goto-char (point-min))
|
|
(when headers
|
|
(insert headers))
|
|
(insert "\n")
|
|
(buffer-string)))
|
|
t))
|
|
|
|
(defun mml1991-pgg-encrypt (_cont &optional sign)
|
|
(goto-char (point-min))
|
|
(when (re-search-forward "^$" nil t)
|
|
(let ((cte (save-restriction
|
|
(narrow-to-region (point-min) (point))
|
|
(mail-fetch-field "content-transfer-encoding"))))
|
|
;; Strip MIME headers since it will be ASCII armored.
|
|
(forward-line 1)
|
|
(delete-region (point-min) (point))
|
|
(when cte
|
|
(mm-decode-content-transfer-encoding (intern (downcase cte))))))
|
|
(unless (let ((pgg-text-mode t))
|
|
(pgg-encrypt-region
|
|
(point-min) (point-max)
|
|
(split-string
|
|
(or
|
|
(message-options-get 'message-recipients)
|
|
(message-options-set 'message-recipients
|
|
(read-string "Recipients: ")))
|
|
"[ \f\t\n\r\v,]+")
|
|
sign))
|
|
(pop-to-buffer pgg-errors-buffer)
|
|
(error "Encrypt error"))
|
|
(delete-region (point-min) (point-max))
|
|
(insert "\n")
|
|
(insert-buffer-substring pgg-output-buffer)
|
|
t)
|
|
|
|
;; epg wrapper
|
|
|
|
(defvar epg-user-id-alist)
|
|
|
|
(autoload 'epg-make-context "epg")
|
|
(autoload 'epa-select-keys "epa")
|
|
(autoload 'epg-list-keys "epg")
|
|
(autoload 'epg-context-set-armor "epg")
|
|
(autoload 'epg-context-set-textmode "epg")
|
|
(autoload 'epg-context-set-signers "epg")
|
|
(autoload 'epg-context-set-passphrase-callback "epg")
|
|
(autoload 'epg-key-sub-key-list "epg")
|
|
(autoload 'epg-sub-key-capability "epg")
|
|
(autoload 'epg-sub-key-validity "epg")
|
|
(autoload 'epg-sub-key-fingerprint "epg")
|
|
(autoload 'epg-sign-string "epg")
|
|
(autoload 'epg-encrypt-string "epg")
|
|
(autoload 'epg-configuration "epg-config")
|
|
(autoload 'epg-expand-group "epg-config")
|
|
|
|
(defun mml1991-epg-sign (_cont)
|
|
(let ((inhibit-redisplay t)
|
|
headers cte)
|
|
;; Don't sign headers.
|
|
(goto-char (point-min))
|
|
(when (re-search-forward "^$" nil t)
|
|
(setq headers (buffer-substring (point-min) (point)))
|
|
(save-restriction
|
|
(narrow-to-region (point-min) (point))
|
|
(setq cte (mail-fetch-field "content-transfer-encoding")))
|
|
(forward-line 1)
|
|
(delete-region (point-min) (point))
|
|
(when cte
|
|
(setq cte (intern (downcase cte)))
|
|
(mm-decode-content-transfer-encoding cte)))
|
|
(let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear))
|
|
(signature (car pair)))
|
|
(unless (stringp signature)
|
|
(error "Signature failed"))
|
|
(delete-region (point-min) (point-max))
|
|
(insert
|
|
(with-temp-buffer
|
|
(set-buffer-multibyte nil)
|
|
(insert signature)
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "\r+$" nil t)
|
|
(replace-match "" t t))
|
|
(when cte
|
|
(mm-encode-content-transfer-encoding cte))
|
|
(goto-char (point-min))
|
|
(when headers
|
|
(insert headers))
|
|
(insert "\n")
|
|
(buffer-string)))
|
|
t)))
|
|
|
|
(defun mml1991-epg-encrypt (cont &optional sign)
|
|
(goto-char (point-min))
|
|
(when (re-search-forward "^$" nil t)
|
|
(let ((cte (save-restriction
|
|
(narrow-to-region (point-min) (point))
|
|
(mail-fetch-field "content-transfer-encoding"))))
|
|
;; Strip MIME headers since it will be ASCII armored.
|
|
(forward-line 1)
|
|
(delete-region (point-min) (point))
|
|
(when cte
|
|
(mm-decode-content-transfer-encoding (intern (downcase cte))))))
|
|
(let ((cipher (mml-secure-epg-encrypt 'OpenPGP cont sign)))
|
|
(delete-region (point-min) (point-max))
|
|
(insert "\n" cipher))
|
|
t)
|
|
|
|
;;;###autoload
|
|
(defun mml1991-encrypt (cont &optional sign)
|
|
(let ((func (nth 2 (assq mml1991-use mml1991-function-alist))))
|
|
(if func
|
|
(funcall func cont sign)
|
|
(error "Cannot find encrypt function"))))
|
|
|
|
;;;###autoload
|
|
(defun mml1991-sign (cont)
|
|
(let ((func (nth 1 (assq mml1991-use mml1991-function-alist))))
|
|
(if func
|
|
(funcall func cont)
|
|
(error "Cannot find sign function"))))
|
|
|
|
(provide 'mml1991)
|
|
|
|
;; Local Variables:
|
|
;; coding: utf-8
|
|
;; End:
|
|
|
|
;;; mml1991.el ends here
|