mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

mml2015-epg-sign: Use From header.

Browse Source 
mml2015.el (mml2015-epg-sign): New variable 'sender' is
 (message-options-get 'message-sender) and append it to mml2015-signers.
 If mm-sign-option is not 'guided, mml2015-signers and sender sign the mail.
This commit is contained in:
Daniel Dehennin 2010-11-16 23:05:02 +00:00 committed by Katsumi Yamaoka
parent 1985927ce8
commit 809fde057f
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View File

@ -1,3 +1,7 @@
2010-11-16 Daniel Dehennin <daniel.dehennin@baby-gnu.org>
* mml2015.el (mml2015-epg-sign): Use From header.
2010-11-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-html.el (gnus-html-wash-images): Register a displayer.

20
lisp/gnus/mml2015.el
View File

@ -941,6 +941,7 @@ Whether the passphrase is cached at all is controlled by
(let* ((inhibit-redisplay t)
(context (epg-make-context))
(boundary (mml-compute-boundary cont))
(sender (message-options-get 'message-sender))
signer-key
(signers
(or (message-options-get 'mml2015-epg-signers)
@ -950,8 +951,8 @@ Whether the passphrase is cached at all is controlled by
(epa-select-keys context "\
Select keys for signing.
If no one is selected, default secret key is used. "
mml2015-signers t)
(if mml2015-signers
(cons sender mml2015-signers) t)
(if (or sender mml2015-signers)
(delq nil
(mapcar
(lambda (signer)
@ -965,7 +966,7 @@ If no one is selected, default secret key is used. "
signer)))
(error "No secret key for %s" signer))
signer-key)
mml2015-signers)))))))
(cons sender mml2015-signers))))))))
signature micalg)
(epg-context-set-armor context t)
(epg-context-set-textmode context t)
@ -1008,6 +1009,7 @@ If no one is selected, default secret key is used. "
(let ((inhibit-redisplay t)
(context (epg-make-context))
(config (epg-configuration))
(sender (message-options-get 'message-sender))
(recipients (message-options-get 'mml2015-epg-recipients))
cipher signers
(boundary (mml-compute-boundary cont))
@ -1025,9 +1027,9 @@ If no one is selected, default secret key is used. "
(read-string "Recipients: ")))
"[ \f\t\n\r\v,]+"))))
(when mml2015-encrypt-to-self
(unless mml2015-signers
(error "mml2015-signers not set"))
(setq recipients (nconc recipients mml2015-signers)))
(unless (or sender mml2015-signers)
(error "Message sender and mml2015-signers not set"))
(setq recipients (nconc recipients (cons sender mml2015-signers))))
(if (eq mm-encrypt-option 'guided)
(setq recipients
(epa-select-keys context "\
@ -1060,8 +1062,8 @@ If no one is selected, symmetric encryption will be performed. "
(epa-select-keys context "\
Select keys for signing.
If no one is selected, default secret key is used. "
mml2015-signers t)
(if mml2015-signers
(cons mml2015-signers) t)
(if (or sender mml2015-signers)
(delq nil
(mapcar
(lambda (signer)
@ -1075,7 +1077,7 @@ If no one is selected, default secret key is used. "
signer)))
(error "No secret key for %s" signer))
signer-key)
mml2015-signers)))))))
(cons mml2015-signers))))))))
(epg-context-set-signers context signers))
(epg-context-set-armor context t)
(epg-context-set-textmode context t)