2004-09-04 13:13:48 +00:00
|
|
|
;;; mml-sec.el --- A package with security functions for MML documents
|
2005-08-06 19:51:42 +00:00
|
|
|
|
2016-01-01 01:16:19 -08:00
|
|
|
;; Copyright (C) 2000-2016 Free Software Foundation, Inc.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; Author: Simon Josefsson <simon@josefsson.org>
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2004-09-04 13:13:48 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:56:49 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2008-05-06 03:56:49 +00:00
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2004-09-04 13:13:48 +00:00
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:56:49 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
2007-12-28 22:26:31 +00:00
|
|
|
|
2015-12-27 21:12:16 +01:00
|
|
|
(autoload 'gnus-subsetp "gnus-util")
|
|
|
|
(autoload 'mail-strip-quoted-names "mail-utils")
|
2004-09-04 13:13:48 +00:00
|
|
|
(autoload 'mml2015-sign "mml2015")
|
|
|
|
(autoload 'mml2015-encrypt "mml2015")
|
|
|
|
(autoload 'mml1991-sign "mml1991")
|
|
|
|
(autoload 'mml1991-encrypt "mml1991")
|
2015-12-27 21:12:16 +01:00
|
|
|
(autoload 'message-fetch-field "message")
|
2004-09-04 13:13:48 +00:00
|
|
|
(autoload 'message-goto-body "message")
|
|
|
|
(autoload 'mml-insert-tag "mml")
|
2007-10-28 09:18:39 +00:00
|
|
|
(autoload 'mml-smime-sign "mml-smime")
|
|
|
|
(autoload 'mml-smime-encrypt "mml-smime")
|
|
|
|
(autoload 'mml-smime-sign-query "mml-smime")
|
|
|
|
(autoload 'mml-smime-encrypt-query "mml-smime")
|
|
|
|
(autoload 'mml-smime-verify "mml-smime")
|
|
|
|
(autoload 'mml-smime-verify-test "mml-smime")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defvar mml-sign-alist
|
|
|
|
'(("smime" mml-smime-sign-buffer mml-smime-sign-query)
|
|
|
|
("pgp" mml-pgp-sign-buffer list)
|
|
|
|
("pgpauto" mml-pgpauto-sign-buffer list)
|
|
|
|
("pgpmime" mml-pgpmime-sign-buffer list))
|
|
|
|
"Alist of MIME signer functions.")
|
|
|
|
|
|
|
|
(defcustom mml-default-sign-method "pgpmime"
|
|
|
|
"Default sign method.
|
|
|
|
The string must have an entry in `mml-sign-alist'."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (const "smime")
|
|
|
|
(const "pgp")
|
|
|
|
(const "pgpauto")
|
|
|
|
(const "pgpmime")
|
|
|
|
string)
|
|
|
|
:group 'message)
|
|
|
|
|
|
|
|
(defvar mml-encrypt-alist
|
|
|
|
'(("smime" mml-smime-encrypt-buffer mml-smime-encrypt-query)
|
|
|
|
("pgp" mml-pgp-encrypt-buffer list)
|
|
|
|
("pgpauto" mml-pgpauto-sign-buffer list)
|
|
|
|
("pgpmime" mml-pgpmime-encrypt-buffer list))
|
|
|
|
"Alist of MIME encryption functions.")
|
|
|
|
|
|
|
|
(defcustom mml-default-encrypt-method "pgpmime"
|
|
|
|
"Default encryption method.
|
|
|
|
The string must have an entry in `mml-encrypt-alist'."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (const "smime")
|
|
|
|
(const "pgp")
|
|
|
|
(const "pgpauto")
|
|
|
|
(const "pgpmime")
|
|
|
|
string)
|
|
|
|
:group 'message)
|
|
|
|
|
|
|
|
(defcustom mml-signencrypt-style-alist
|
|
|
|
'(("smime" separate)
|
|
|
|
("pgp" combined)
|
|
|
|
("pgpauto" combined)
|
|
|
|
("pgpmime" combined))
|
|
|
|
"Alist specifying if `signencrypt' results in two separate operations or not.
|
|
|
|
The first entry indicates the MML security type, valid entries include
|
|
|
|
the strings \"smime\", \"pgp\", and \"pgpmime\". The second entry is
|
|
|
|
a symbol `separate' or `combined' where `separate' means that MML signs
|
|
|
|
and encrypt messages in a two step process, and `combined' means that MML
|
|
|
|
signs and encrypt the message in one step.
|
|
|
|
|
|
|
|
Note that the output generated by using a `combined' mode is NOT
|
|
|
|
understood by all PGP implementations, in particular PGP version
|
|
|
|
2 does not support it! See Info node `(message)Security' for
|
|
|
|
details."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-08 18:17:56 +00:00
|
|
|
:group 'message
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (list (choice (const :tag "S/MIME" "smime")
|
|
|
|
(const :tag "PGP" "pgp")
|
|
|
|
(const :tag "PGP/MIME" "pgpmime")
|
|
|
|
(string :tag "User defined"))
|
|
|
|
(choice (const :tag "Separate" separate)
|
|
|
|
(const :tag "Combined" combined)))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom mml-secure-verbose nil
|
|
|
|
"If non-nil, ask the user about the current operation more verbosely."
|
|
|
|
:group 'message
|
|
|
|
:type 'boolean)
|
|
|
|
|
Synch with Gnus trunk
=====================
2010-03-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (canlock-verify): Autoload it for Emacs 21.
* message.el (ecomplete-setup): Autoload it for Emacs <23.
* mml-sec.el (mml-secure-cache-passphrase): Default to t that is
password-cache's default if it is not bound.
(mml-secure-passphrase-cache-expiry): Default to 16 that is
password-cache-expiry's default if it is not bound.
* pop3.el (pop3-list): Don't use 3rd arg of `split-string' which is not
available in Emacs 21.
2010-03-23 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el (auth-sources): Fix up definition so extra parameters
are always inline.
2010-03-22 Martin Stjernholm <mast@lysator.liu.se>
* nnimap.el (nnimap-verify-uidvalidity): Fixed bug where uidvalidity
wasn't updated after mismatch. Clear cached mailbox info correctly
when uidvalidity changes.
(nnimap-group-prefixed-name): New function to avoid some code
duplication.
(nnimap-verify-uidvalidity, nnimap-group-overview-filename)
(nnimap-request-group): Use it.
(nnimap-retrieve-groups, nnimap-verify-uidvalidity)
(nnimap-update-unseen): Significantly improved speed of Gnus startup
with many imap folders. This is done by caching the group status from
the imap server persistently in a group parameter `imap-status'. (This
was cached before too if `nnimap-retrieve-groups-asynchronous' was set,
but not persistently, so every Gnus startup was still very slow.)
2010-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el: Set up autoloads. Bump to 23.2 because of the
secrets.el dependency.
(auth-sources): Add optional user name. Add secrets.el configuration
choice (unused right now).
2010-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-sum.el (gnus-summary-make-menu-bar): Let
`gnus-registry-install-shortcuts' fill in the functions.
* gnus-registry.el (gnus-summary-misc-menu): Declare to avoid
warnings.
(gnus-registry-misc-menus): Variable to hold registry mark menus.
(gnus-registry-install-shortcuts): Populate and use it in a
`gnus-summary-menu-hook' lambda, under "Gnus"->"Registry Marks".
2010-03-20 Martin Stjernholm <mast@lysator.liu.se>
* nnimap.el (nnimap-decode-group-name, nnimap-encode-group-name):
In-place substitutions for the group name encoding/decoding.
(nnimap-find-minmax-uid, nnimap-possibly-change-group)
(nnimap-retrieve-headers-progress, nnimap-possibly-change-group)
(nnimap-retrieve-headers-progress, nnimap-request-article-part)
(nnimap-update-unseen, nnimap-request-list)
(nnimap-retrieve-groups, nnimap-request-update-info-internal)
(nnimap-request-set-mark, nnimap-split-to-groups)
(nnimap-split-articles, nnimap-request-newgroups)
(nnimap-request-create-group, nnimap-request-accept-article)
(nnimap-request-delete-group, nnimap-request-rename-group)
(nnimap-acl-get, nnimap-acl-edit): Use them. Replace `mbx' with
`encoded-mbx' for consistency.
(nnimap-close-group): Call `imap-current-mailbox' instead of using the
variable `imap-current-mailbox'.
* gnus-agent.el (gnus-agent-fetch-articles, gnus-agent-fetch-headers)
(gnus-agent-regenerate-group): Use `gnus-agent-decoded-group-name'.
2010-03-20 Bojan Petrovic <bpetrovi@f.bg.ac.rs>
* pop3.el (pop3-display-message-size-flag): Display message size byte
counts during POP3 download.
(pop3-movemail): Use it.
(pop3-list): Implement listing of available messages.
2010-03-20 Mark Triggs <mst@dishevelled.net> (tiny change)
* nnir.el (nnir-get-article-nov-override-function): New function to
override the normal NOV retrieval.
(nnir-retrieve-headers): Use it.
2010-03-23 07:37:09 +00:00
|
|
|
(defcustom mml-secure-cache-passphrase
|
|
|
|
(if (boundp 'password-cache)
|
|
|
|
password-cache
|
|
|
|
t)
|
2007-10-28 09:18:39 +00:00
|
|
|
"If t, cache passphrase."
|
|
|
|
:group 'message
|
|
|
|
:type 'boolean)
|
|
|
|
|
Synch with Gnus trunk
=====================
2010-03-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (canlock-verify): Autoload it for Emacs 21.
* message.el (ecomplete-setup): Autoload it for Emacs <23.
* mml-sec.el (mml-secure-cache-passphrase): Default to t that is
password-cache's default if it is not bound.
(mml-secure-passphrase-cache-expiry): Default to 16 that is
password-cache-expiry's default if it is not bound.
* pop3.el (pop3-list): Don't use 3rd arg of `split-string' which is not
available in Emacs 21.
2010-03-23 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el (auth-sources): Fix up definition so extra parameters
are always inline.
2010-03-22 Martin Stjernholm <mast@lysator.liu.se>
* nnimap.el (nnimap-verify-uidvalidity): Fixed bug where uidvalidity
wasn't updated after mismatch. Clear cached mailbox info correctly
when uidvalidity changes.
(nnimap-group-prefixed-name): New function to avoid some code
duplication.
(nnimap-verify-uidvalidity, nnimap-group-overview-filename)
(nnimap-request-group): Use it.
(nnimap-retrieve-groups, nnimap-verify-uidvalidity)
(nnimap-update-unseen): Significantly improved speed of Gnus startup
with many imap folders. This is done by caching the group status from
the imap server persistently in a group parameter `imap-status'. (This
was cached before too if `nnimap-retrieve-groups-asynchronous' was set,
but not persistently, so every Gnus startup was still very slow.)
2010-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el: Set up autoloads. Bump to 23.2 because of the
secrets.el dependency.
(auth-sources): Add optional user name. Add secrets.el configuration
choice (unused right now).
2010-03-20 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-sum.el (gnus-summary-make-menu-bar): Let
`gnus-registry-install-shortcuts' fill in the functions.
* gnus-registry.el (gnus-summary-misc-menu): Declare to avoid
warnings.
(gnus-registry-misc-menus): Variable to hold registry mark menus.
(gnus-registry-install-shortcuts): Populate and use it in a
`gnus-summary-menu-hook' lambda, under "Gnus"->"Registry Marks".
2010-03-20 Martin Stjernholm <mast@lysator.liu.se>
* nnimap.el (nnimap-decode-group-name, nnimap-encode-group-name):
In-place substitutions for the group name encoding/decoding.
(nnimap-find-minmax-uid, nnimap-possibly-change-group)
(nnimap-retrieve-headers-progress, nnimap-possibly-change-group)
(nnimap-retrieve-headers-progress, nnimap-request-article-part)
(nnimap-update-unseen, nnimap-request-list)
(nnimap-retrieve-groups, nnimap-request-update-info-internal)
(nnimap-request-set-mark, nnimap-split-to-groups)
(nnimap-split-articles, nnimap-request-newgroups)
(nnimap-request-create-group, nnimap-request-accept-article)
(nnimap-request-delete-group, nnimap-request-rename-group)
(nnimap-acl-get, nnimap-acl-edit): Use them. Replace `mbx' with
`encoded-mbx' for consistency.
(nnimap-close-group): Call `imap-current-mailbox' instead of using the
variable `imap-current-mailbox'.
* gnus-agent.el (gnus-agent-fetch-articles, gnus-agent-fetch-headers)
(gnus-agent-regenerate-group): Use `gnus-agent-decoded-group-name'.
2010-03-20 Bojan Petrovic <bpetrovi@f.bg.ac.rs>
* pop3.el (pop3-display-message-size-flag): Display message size byte
counts during POP3 download.
(pop3-movemail): Use it.
(pop3-list): Implement listing of available messages.
2010-03-20 Mark Triggs <mst@dishevelled.net> (tiny change)
* nnir.el (nnir-get-article-nov-override-function): New function to
override the normal NOV retrieval.
(nnir-retrieve-headers): Use it.
2010-03-23 07:37:09 +00:00
|
|
|
(defcustom mml-secure-passphrase-cache-expiry
|
|
|
|
(if (boundp 'password-cache-expiry)
|
|
|
|
password-cache-expiry
|
|
|
|
16)
|
2007-10-28 09:18:39 +00:00
|
|
|
"How many seconds the passphrase is cached.
|
|
|
|
Whether the passphrase is cached at all is controlled by
|
|
|
|
`mml-secure-cache-passphrase'."
|
|
|
|
:group 'message
|
|
|
|
:type 'integer)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; Configuration/helper functions
|
|
|
|
|
|
|
|
(defun mml-signencrypt-style (method &optional style)
|
|
|
|
"Function for setting/getting the signencrypt-style used. Takes two
|
|
|
|
arguments, the method (e.g. \"pgp\") and optionally the mode
|
|
|
|
\(e.g. combined). If the mode is omitted, the current value is returned.
|
|
|
|
|
|
|
|
For example, if you prefer to use combined sign & encrypt with
|
|
|
|
smime, putting the following in your Gnus startup file will
|
|
|
|
enable that behavior:
|
|
|
|
|
|
|
|
\(mml-set-signencrypt-style \"smime\" combined)
|
|
|
|
|
|
|
|
You can also customize or set `mml-signencrypt-style-alist' instead."
|
|
|
|
(let ((style-item (assoc method mml-signencrypt-style-alist)))
|
|
|
|
(if style-item
|
|
|
|
(if (or (eq style 'separate)
|
|
|
|
(eq style 'combined))
|
|
|
|
;; valid style setting?
|
|
|
|
(setf (second style-item) style)
|
|
|
|
;; otherwise, just return the current value
|
|
|
|
(second style-item))
|
2004-09-29 06:35:14 +00:00
|
|
|
(message "Warning, attempt to set invalid signencrypt style"))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; Security functions
|
|
|
|
|
|
|
|
(defun mml-smime-sign-buffer (cont)
|
|
|
|
(or (mml-smime-sign cont)
|
|
|
|
(error "Signing failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-smime-encrypt-buffer (cont &optional sign)
|
|
|
|
(when sign
|
|
|
|
(message "Combined sign and encrypt S/MIME not support yet")
|
|
|
|
(sit-for 1))
|
|
|
|
(or (mml-smime-encrypt cont)
|
|
|
|
(error "Encryption failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-pgp-sign-buffer (cont)
|
|
|
|
(or (mml1991-sign cont)
|
|
|
|
(error "Signing failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-pgp-encrypt-buffer (cont &optional sign)
|
|
|
|
(or (mml1991-encrypt cont sign)
|
|
|
|
(error "Encryption failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-pgpmime-sign-buffer (cont)
|
|
|
|
(or (mml2015-sign cont)
|
|
|
|
(error "Signing failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-pgpmime-encrypt-buffer (cont &optional sign)
|
|
|
|
(or (mml2015-encrypt cont sign)
|
|
|
|
(error "Encryption failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-pgpauto-sign-buffer (cont)
|
|
|
|
(message-goto-body)
|
|
|
|
(or (if (re-search-backward "Content-Type: *multipart/.*" nil t) ; there must be a better way...
|
|
|
|
(mml2015-sign cont)
|
|
|
|
(mml1991-sign cont))
|
|
|
|
(error "Encryption failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-pgpauto-encrypt-buffer (cont &optional sign)
|
|
|
|
(message-goto-body)
|
|
|
|
(or (if (re-search-backward "Content-Type: *multipart/.*" nil t) ; there must be a better way...
|
|
|
|
(mml2015-encrypt cont sign)
|
|
|
|
(mml1991-encrypt cont sign))
|
|
|
|
(error "Encryption failed... inspect message logs for errors")))
|
|
|
|
|
|
|
|
(defun mml-secure-part (method &optional sign)
|
|
|
|
(save-excursion
|
|
|
|
(let ((tags (funcall (nth 2 (assoc method (if sign mml-sign-alist
|
|
|
|
mml-encrypt-alist))))))
|
|
|
|
(cond ((re-search-backward
|
|
|
|
"<#\\(multipart\\|part\\|external\\|mml\\)" nil t)
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(insert (if sign " sign=" " encrypt=") method)
|
|
|
|
(while tags
|
|
|
|
(let ((key (pop tags))
|
|
|
|
(value (pop tags)))
|
|
|
|
(when value
|
|
|
|
;; Quote VALUE if it contains suspicious characters.
|
|
|
|
(when (string-match "[\"'\\~/*;() \t\n]" value)
|
|
|
|
(setq value (prin1-to-string value)))
|
|
|
|
(insert (format " %s=%s" key value))))))
|
|
|
|
((or (re-search-backward
|
|
|
|
(concat "^" (regexp-quote mail-header-separator) "\n") nil t)
|
|
|
|
(re-search-forward
|
|
|
|
(concat "^" (regexp-quote mail-header-separator) "\n") nil t))
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(apply 'mml-insert-tag 'part (cons (if sign 'sign 'encrypt)
|
|
|
|
(cons method tags))))
|
|
|
|
(t (error "The message is corrupted. No mail header separator"))))))
|
|
|
|
|
2006-04-26 21:58:05 +00:00
|
|
|
(defvar mml-secure-method
|
|
|
|
(if (equal mml-default-encrypt-method mml-default-sign-method)
|
|
|
|
mml-default-sign-method
|
|
|
|
"pgpmime")
|
|
|
|
"Current security method. Internal variable.")
|
|
|
|
|
|
|
|
(defun mml-secure-sign (&optional method)
|
|
|
|
"Add MML tags to sign this MML part.
|
|
|
|
Use METHOD if given. Else use `mml-secure-method' or
|
|
|
|
`mml-default-sign-method'."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part
|
|
|
|
(or method mml-secure-method mml-default-sign-method)
|
|
|
|
'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-encrypt (&optional method)
|
|
|
|
"Add MML tags to encrypt this MML part.
|
|
|
|
Use METHOD if given. Else use `mml-secure-method' or
|
|
|
|
`mml-default-sign-method'."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part
|
|
|
|
(or method mml-secure-method mml-default-sign-method)))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-secure-sign-pgp ()
|
|
|
|
"Add MML tags to PGP sign this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "pgp" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-sign-pgpauto ()
|
|
|
|
"Add MML tags to PGP-auto sign this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "pgpauto" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-sign-pgpmime ()
|
|
|
|
"Add MML tags to PGP/MIME sign this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "pgpmime" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-sign-smime ()
|
|
|
|
"Add MML tags to S/MIME sign this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "smime" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-encrypt-pgp ()
|
|
|
|
"Add MML tags to PGP encrypt this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "pgp"))
|
|
|
|
|
|
|
|
(defun mml-secure-encrypt-pgpmime ()
|
|
|
|
"Add MML tags to PGP/MIME encrypt this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "pgpmime"))
|
|
|
|
|
|
|
|
(defun mml-secure-encrypt-smime ()
|
|
|
|
"Add MML tags to S/MIME encrypt this MML part."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-part "smime"))
|
|
|
|
|
|
|
|
;; defuns that add the proper <#secure ...> tag to the top of the message body
|
|
|
|
(defun mml-secure-message (method &optional modesym)
|
|
|
|
(let ((mode (prin1-to-string modesym))
|
2007-10-28 09:18:39 +00:00
|
|
|
(tags (append
|
|
|
|
(if (or (eq modesym 'sign)
|
|
|
|
(eq modesym 'signencrypt))
|
|
|
|
(funcall (nth 2 (assoc method mml-sign-alist))))
|
|
|
|
(if (or (eq modesym 'encrypt)
|
|
|
|
(eq modesym 'signencrypt))
|
|
|
|
(funcall (nth 2 (assoc method mml-encrypt-alist))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
insert-loc)
|
|
|
|
(mml-unsecure-message)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(cond ((re-search-forward
|
|
|
|
(concat "^" (regexp-quote mail-header-separator) "\n") nil t)
|
|
|
|
(goto-char (setq insert-loc (match-end 0)))
|
|
|
|
(unless (looking-at "<#secure")
|
2007-10-28 09:18:39 +00:00
|
|
|
(apply 'mml-insert-tag
|
|
|
|
'secure 'method method 'mode mode tags)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(t (error
|
|
|
|
"The message is corrupted. No mail header separator"))))
|
|
|
|
(when (eql insert-loc (point))
|
|
|
|
(forward-line 1))))
|
|
|
|
|
|
|
|
(defun mml-unsecure-message ()
|
|
|
|
"Remove security related MML tags from message."
|
|
|
|
(interactive)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-max))
|
|
|
|
(when (re-search-backward "^<#secure.*>\n" nil t)
|
|
|
|
(delete-region (match-beginning 0) (match-end 0)))))
|
|
|
|
|
2006-04-26 21:58:05 +00:00
|
|
|
|
|
|
|
(defun mml-secure-message-sign (&optional method)
|
2010-05-06 05:54:57 +00:00
|
|
|
"Add MML tags to sign the entire message.
|
2006-04-26 21:58:05 +00:00
|
|
|
Use METHOD if given. Else use `mml-secure-method' or
|
|
|
|
`mml-default-sign-method'."
|
|
|
|
(interactive)
|
2010-05-06 05:54:57 +00:00
|
|
|
(mml-secure-message
|
2006-04-26 21:58:05 +00:00
|
|
|
(or method mml-secure-method mml-default-sign-method)
|
|
|
|
'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-message-sign-encrypt (&optional method)
|
|
|
|
"Add MML tag to sign and encrypt the entire message.
|
|
|
|
Use METHOD if given. Else use `mml-secure-method' or
|
|
|
|
`mml-default-sign-method'."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-message
|
|
|
|
(or method mml-secure-method mml-default-sign-method)
|
|
|
|
'signencrypt))
|
|
|
|
|
|
|
|
(defun mml-secure-message-encrypt (&optional method)
|
|
|
|
"Add MML tag to encrypt the entire message.
|
|
|
|
Use METHOD if given. Else use `mml-secure-method' or
|
|
|
|
`mml-default-sign-method'."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-message
|
|
|
|
(or method mml-secure-method mml-default-sign-method)
|
|
|
|
'encrypt))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml-secure-message-sign-smime ()
|
|
|
|
"Add MML tag to encrypt/sign the entire message."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-message "smime" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-message-sign-pgp ()
|
|
|
|
"Add MML tag to encrypt/sign the entire message."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-message "pgp" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-message-sign-pgpmime ()
|
|
|
|
"Add MML tag to encrypt/sign the entire message."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-message "pgpmime" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-message-sign-pgpauto ()
|
|
|
|
"Add MML tag to encrypt/sign the entire message."
|
|
|
|
(interactive)
|
|
|
|
(mml-secure-message "pgpauto" 'sign))
|
|
|
|
|
|
|
|
(defun mml-secure-message-encrypt-smime (&optional dontsign)
|
|
|
|
"Add MML tag to encrypt and sign the entire message.
|
|
|
|
If called with a prefix argument, only encrypt (do NOT sign)."
|
|
|
|
(interactive "P")
|
|
|
|
(mml-secure-message "smime" (if dontsign 'encrypt 'signencrypt)))
|
|
|
|
|
|
|
|
(defun mml-secure-message-encrypt-pgp (&optional dontsign)
|
|
|
|
"Add MML tag to encrypt and sign the entire message.
|
|
|
|
If called with a prefix argument, only encrypt (do NOT sign)."
|
|
|
|
(interactive "P")
|
|
|
|
(mml-secure-message "pgp" (if dontsign 'encrypt 'signencrypt)))
|
|
|
|
|
|
|
|
(defun mml-secure-message-encrypt-pgpmime (&optional dontsign)
|
|
|
|
"Add MML tag to encrypt and sign the entire message.
|
|
|
|
If called with a prefix argument, only encrypt (do NOT sign)."
|
|
|
|
(interactive "P")
|
|
|
|
(mml-secure-message "pgpmime" (if dontsign 'encrypt 'signencrypt)))
|
|
|
|
|
|
|
|
(defun mml-secure-message-encrypt-pgpauto (&optional dontsign)
|
|
|
|
"Add MML tag to encrypt and sign the entire message.
|
|
|
|
If called with a prefix argument, only encrypt (do NOT sign)."
|
|
|
|
(interactive "P")
|
|
|
|
(mml-secure-message "pgpauto" (if dontsign 'encrypt 'signencrypt)))
|
|
|
|
|
|
|
|
(provide 'mml-sec)
|
|
|
|
|
|
|
|
;;; mml-sec.el ends here
|