From 415ebccf3a9e3be15175d7a6e49a302c4849e962 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Fri, 28 Jul 2006 05:45:37 +0000 Subject: [PATCH] * mml2015.el (mml2015-epg-sign): If mml2015-signers is not set, use the first matching secret key. (mml2015-epg-encrypt): Ditto. * mml1991.el (mml1991-epg-sign): If mml1991-signers is not set, use the first matching secret key. (mml1991-epg-encrypt): Ditto. --- lisp/ChangeLog | 8 ++++++++ lisp/mml1991.el | 48 ++++++++++++++++++++++++++++++------------------ lisp/mml2015.el | 45 +++++++++++++++++++++++++++++---------------- 3 files changed, 67 insertions(+), 34 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f5abd7a9..a1e64779b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,13 @@ 2006-07-28 Daiki Ueno + * mml2015.el (mml2015-epg-sign): If mml2015-signers is not set, use the + first matching secret key. + (mml2015-epg-encrypt): Ditto. + + * mml1991.el (mml1991-epg-sign): If mml1991-signers is not set, use the + first matching secret key. + (mml1991-epg-encrypt): Ditto. + * mml2015.el (mml2015-encrypt-to-self): New user option. (mml2015-epg-encrypt): Append mml2015-signers to recipients list if mml2015-epg-encrypt-to-self is set. diff --git a/lisp/mml1991.el b/lisp/mml1991.el index e5439830e..a9186244f 100644 --- a/lisp/mml1991.el +++ b/lisp/mml1991.el @@ -363,10 +363,14 @@ 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)) + (setq signers (list (car (epg-list-keys + context + (message-options-get 'mml-sender) + t)))))) (epg-context-set-armor context t) (epg-context-set-textmode context t) (epg-context-set-signers context signers) @@ -422,8 +426,7 @@ If no one is selected, default secret key is used. " (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))) + (if mml1991-verbose (setq recipients (epa-select-keys context "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " @@ -434,24 +437,33 @@ If no one is selected, symmetric encryption will be performed. " (setq recipients (mapcar (lambda (name) (car (epg-list-keys context name))) - (split-string - (message-options-get 'message-recipients) - "[ \f\t\n\r\v,]+")))) + (if (message-options-get 'message-recipients) + (split-string + (message-options-get 'message-recipients) + "[ \f\t\n\r\v,]+"))))) (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))) + (setq recipients + (nconc recipients + (list (car (epg-list-keys context nil t))))))) (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)) + (setq signers (list (car (epg-list-keys + context + (message-options-get 'mml-sender) + t)))))) (epg-context-set-signers context signers)) (epg-context-set-armor context t) (epg-context-set-textmode context t) diff --git a/lisp/mml2015.el b/lisp/mml2015.el index b83077bf3..f08fa1421 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -1117,10 +1117,14 @@ 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. " mml2015-signers t)) - (setq signers (mapcar (lambda (name) - (car (epg-list-keys context name t))) - (or mml2015-signers - (list (message-options-get 'mml-sender)))))) + (if mml2015-signers + (setq signers (mapcar (lambda (name) + (car (epg-list-keys context name t))) + mml2015-signers)) + (setq signers (list (car (epg-list-keys + context + (message-options-get 'mml-sender) + t)))))) (epg-context-set-armor context t) (epg-context-set-textmode context t) (epg-context-set-signers context signers) @@ -1174,24 +1178,33 @@ If no one is selected, symmetric encryption will be performed. " (setq recipients (mapcar (lambda (name) (car (epg-list-keys context name))) - (split-string - (message-options-get 'message-recipients) - "[ \f\t\n\r\v,]+")))) + (if (message-options-get 'message-recipients) + (split-string + (message-options-get 'message-recipients) + "[ \f\t\n\r\v,]+"))))) (if mml2015-encrypt-to-self - (setq recipients - (nconc recipients - (mapcar (lambda (name) - (car (epg-list-keys context name))) - mml2015-signers)))) + (if mml2015-signers + (setq recipients + (nconc recipients + (mapcar (lambda (name) + (car (epg-list-keys context name))) + mml2015-signers))) + (setq recipients + (nconc recipients + (list (car (epg-list-keys context nil t))))))) (when sign (if mml2015-verbose (setq signers (epa-select-keys context "Select keys for signing. If no one is selected, default secret key is used. " mml2015-signers t)) - (setq signers (mapcar (lambda (name) - (car (epg-list-keys context name t))) - (or mml2015-signers - (list (message-options-get 'mml-sender)))))) + (if mml2015-signers + (setq signers (mapcar (lambda (name) + (car (epg-list-keys context name t))) + mml2015-signers)) + (setq signers (list (car (epg-list-keys + context + (message-options-get 'mml-sender) + t)))))) (epg-context-set-signers context signers)) (epg-context-set-armor context t) (epg-context-set-textmode context t) -- 2.25.1