X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fmml1991.el;h=ca02f1b379eb8d27a785afa26da4821630ed7670;hp=e5439830e69b4a797f4f0bc5e9275f97799e4350;hb=8b5af94e55ef83ee46b42d32d92fa1ce95dcacf5;hpb=fc5f36eb73c4346ec333f4cd83176a0d17b5997d diff --git a/lisp/mml1991.el b/lisp/mml1991.el index e5439830e..ca02f1b37 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -1,33 +1,35 @@ ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -;; Author: Sascha Lüdecke , +;; Author: Sascha Ldecke , ;; Simon Josefsson (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 +;; 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 2, or (at your option) -;; any later version. +;; 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 +;; 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; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: ;;; Code: +;; For Emacs < 22.2. +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (eval-when-compile (require 'cl) (require 'mm-util)) @@ -39,6 +41,11 @@ (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") + (defvar mml1991-use mml2015-use "The package used for PGP.") @@ -111,6 +118,9 @@ Whether the passphrase is cached at all is controlled by (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 @@ -161,6 +171,13 @@ Whether the passphrase is cached at all is controlled by (eval-and-compile (autoload 'gpg-sign-cleartext "gpg")) +(declare-function gpg-sign-encrypt "ext:gpg" + (plaintext ciphertext result recipients &optional + passphrase sign-with-key armor textmode)) +(declare-function gpg-encrypt "ext:gpg" + (plaintext ciphertext result recipients &optional + passphrase armor textmode)) + (defun mml1991-gpg-sign (cont) (let ((text (current-buffer)) headers signature @@ -244,10 +261,9 @@ Whether the passphrase is cached at all is controlled by ;; pgg wrapper -(eval-when-compile - (defvar pgg-default-user-id) - (defvar pgg-errors-buffer) - (defvar pgg-output-buffer)) +(defvar pgg-default-user-id) +(defvar pgg-errors-buffer) +(defvar pgg-output-buffer) (defun mml1991-pgg-sign (cont) (let ((pgg-text-mode t) @@ -313,11 +329,11 @@ Whether the passphrase is cached at all is controlled by ;; epg wrapper -(eval-and-compile - (autoload 'epg-make-context "epg")) +(defvar epg-user-id-alist) +(defvar password-cache-expiry) -(eval-when-compile - (defvar epg-user-id-alist) +(eval-and-compile + (autoload 'epg-make-context "epg") (autoload 'epg-passphrase-callback-function "epg") (autoload 'epa-select-keys "epa") (autoload 'epg-list-keys "epg") @@ -326,13 +342,9 @@ Whether the passphrase is cached at all is controlled by (autoload 'epg-context-set-signers "epg") (autoload 'epg-context-set-passphrase-callback "epg") (autoload 'epg-sign-string "epg") - (autoload 'epg-encrypt-string "epg")) - -(eval-when-compile - (defvar password-cache-expiry) - (autoload 'password-read "password") - (autoload 'password-cache-add "password") - (autoload 'password-cache-remove "password")) + (autoload 'epg-encrypt-string "epg") + (autoload 'epg-configuration "epg-config") + (autoload 'epg-expand-group "epg-config")) (defvar mml1991-epg-secret-key-id-list nil) @@ -363,10 +375,10 @@ Whether the passphrase is cached at all is controlled by (setq signers (epa-select-keys context "Select keys for signing. If no one is selected, default secret key is used. " mml1991-signers t)) - (setq signers (mapcar (lambda (name) - (car (epg-list-keys context name t))) - (or mml1991-signers - (list (message-options-get 'mml-sender)))))) + (if mml1991-signers + (setq signers (mapcar (lambda (name) + (car (epg-list-keys context name t))) + mml1991-signers)))) (epg-context-set-armor context t) (epg-context-set-textmode context t) (epg-context-set-signers context signers) @@ -421,37 +433,50 @@ If no one is selected, default secret key is used. " (when cte (mm-decode-content-transfer-encoding (intern (downcase cte)))))) (let ((context (epg-make-context)) - recipients cipher signers) - (if (or mml1991-verbose - (null (message-options-get 'message-recipients))) + (recipients + (if (message-options-get 'message-recipients) + (split-string + (message-options-get 'message-recipients) + "[ \f\t\n\r\v,]+"))) + cipher signers config) + ;; We should remove this check if epg-0.0.6 is released. + (if (and (condition-case nil + (require 'epg-config) + (error)) + (functionp #'epg-expand-group)) + (setq config (epg-configuration) + recipients + (apply #'nconc + (mapcar (lambda (recipient) + (or (epg-expand-group config recipient) + (list recipient))) + recipients)))) + (if mml1991-verbose (setq recipients (epa-select-keys context "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " - (if (message-options-get 'message-recipients) - (split-string - (message-options-get 'message-recipients) - "[ \f\t\n\r\v,]+")))) + recipients)) (setq recipients - (mapcar (lambda (name) - (car (epg-list-keys context name))) - (split-string - (message-options-get 'message-recipients) - "[ \f\t\n\r\v,]+")))) + (delq nil (mapcar (lambda (name) + (car (epg-list-keys context name))) + recipients)))) (if mml1991-encrypt-to-self - (setq recipients - (nconc recipients - (mapcar (lambda (name) - (car (epg-list-keys context name))) - mml1991-signers)))) + (if mml1991-signers + (setq recipients + (nconc recipients + (mapcar (lambda (name) + (car (epg-list-keys context name))) + mml1991-signers))) + (error "mml1991-signers not set"))) (when sign (if mml1991-verbose (setq signers (epa-select-keys context "Select keys for signing. If no one is selected, default secret key is used. " mml1991-signers t)) - (setq signers (mapcar (lambda (name) - (car (epg-list-keys context name t))) - (or mml1991-signers - (list (message-options-get 'mml-sender)))))) + (if mml1991-signers + (setq signers (mapcar (lambda (name) + (car (epg-list-keys context name t))) + mml1991-signers)))) (epg-context-set-signers context signers)) (epg-context-set-armor context t) (epg-context-set-textmode context t) @@ -493,5 +518,5 @@ If no one is selected, default secret key is used. " ;; coding: iso-8859-1 ;; End: -;;; arch-tag: e542be18-ab28-4393-9b33-97fe9cf30706 +;; arch-tag: e542be18-ab28-4393-9b33-97fe9cf30706 ;;; mml1991.el ends here