2004-09-04 13:13:48 +00:00
|
|
|
;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
|
2005-08-06 19:51:42 +00:00
|
|
|
|
2020-01-01 00:19:43 +00:00
|
|
|
;; Copyright (C) 2000-2020 Free Software Foundation, Inc.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
|
|
|
|
;; Keywords: PGP MIME MML
|
|
|
|
|
|
|
|
;; 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
|
|
|
|
;; 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.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2008-05-06 03:56:49 +00:00
|
|
|
;; 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.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; RFC 2015 is updated by RFC 3156, this file should be compatible
|
|
|
|
;; with both.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
gnus: replace cl with cl-lib
* lisp/gnus/gnus-agent.el, lisp/gnus/gnus-art.el:
* lisp/gnus/gnus-async.el, lisp/gnus/gnus-cache.el:
* lisp/gnus/gnus-demon.el, lisp/gnus/gnus-group.el:
* lisp/gnus/gnus-icalendar.el, lisp/gnus/gnus-logic.el:
* lisp/gnus/gnus-msg.el, lisp/gnus/gnus-picon.el:
* lisp/gnus/gnus-registry.el, lisp/gnus/gnus-salt.el:
* lisp/gnus/gnus-score.el, lisp/gnus/gnus-spec.el:
* lisp/gnus/gnus-srvr.el, lisp/gnus/gnus-start.el:
* lisp/gnus/gnus-sum.el, lisp/gnus/gnus-topic.el:
* lisp/gnus/gnus-util.el, lisp/gnus/gnus-uu.el, lisp/gnus/gnus-win.el:
* lisp/gnus/mail-source.el, lisp/gnus/mm-decode.el:
* lisp/gnus/mm-encode.el, lisp/gnus/mm-url.el, lisp/gnus/mm-view.el:
* lisp/gnus/mml-smime.el, lisp/gnus/mml.el, lisp/gnus/mml2015.el:
* lisp/gnus/nnbabyl.el, lisp/gnus/nndoc.el, lisp/gnus/nneething.el:
* lisp/gnus/nnheader.el, lisp/gnus/nnimap.el, lisp/gnus/nnmail.el:
* lisp/gnus/nnmaildir.el, lisp/gnus/nnoo.el, lisp/gnus/nnrss.el:
* lisp/gnus/nnspool.el, lisp/gnus/nntp.el, lisp/gnus/nnvirtual.el:
* lisp/gnus/nnweb.el, lisp/gnus/spam.el: Replace cl with cl-lib.
* lisp/gnus/canlock.el, lisp/gnus/gnus-bcklg.el:
* lisp/gnus/gnus-cite.el, lisp/gnus/gnus-cloud.el:
* lisp/gnus/gnus-draft.el, lisp/gnus/gnus-dup.el:
* lisp/gnus/gnus-fun.el, lisp/gnus/gnus-html.el:
* lisp/gnus/gnus-int.el, lisp/gnus/gnus-kill.el, lisp/gnus/gnus-ml.el:
* lisp/gnus/gnus-mlspl.el, lisp/gnus/gnus-range.el:
* lisp/gnus/gnus-undo.el, lisp/gnus/gnus-vm.el:
* lisp/gnus/mm-partial.el, lisp/gnus/mm-uu.el, lisp/gnus/mml1991.el:
* lisp/gnus/nnagent.el, lisp/gnus/nndiary.el, lisp/gnus/nndir.el:
* lisp/gnus/nndraft.el, lisp/gnus/nnfolder.el, lisp/gnus/nngateway.el:
* lisp/gnus/nnmairix.el, lisp/gnus/nnmbox.el, lisp/gnus/nnmh.el:
* lisp/gnus/nnml.el, lisp/gnus/score-mode.el, lisp/gnus/smiley.el:
No need for cl.
2018-03-23 16:13:09 -04:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
2004-09-04 13:13:48 +00:00
|
|
|
(require 'mm-decode)
|
|
|
|
(require 'mm-util)
|
|
|
|
(require 'mml)
|
2007-10-28 09:18:39 +00:00
|
|
|
(require 'mml-sec)
|
2016-03-17 00:14:11 -07:00
|
|
|
(require 'epg-config)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2005-08-31 13:10:00 +00:00
|
|
|
(defvar mc-pgp-always-sign)
|
|
|
|
|
2007-12-11 05:26:52 +00:00
|
|
|
(declare-function epg-check-configuration "ext:epg-config"
|
|
|
|
(config &optional minimum-version))
|
|
|
|
(declare-function epg-configuration "ext:epg-config" ())
|
|
|
|
|
2013-05-08 23:46:51 -07:00
|
|
|
;; Maybe this should be in eg mml-sec.el (and have a different name).
|
|
|
|
;; Then mml1991 would not need to require mml2015, and mml1991-use
|
|
|
|
;; could be removed.
|
2016-03-17 00:14:11 -07:00
|
|
|
(defvar mml2015-use 'epg
|
2007-10-28 09:18:39 +00:00
|
|
|
"The package used for PGP/MIME.
|
2010-09-26 04:03:19 +00:00
|
|
|
Valid packages include `epg', `pgg' and `mailcrypt'.")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; Something is not RFC2015.
|
|
|
|
(defvar mml2015-function-alist
|
|
|
|
'((mailcrypt mml2015-mailcrypt-sign
|
|
|
|
mml2015-mailcrypt-encrypt
|
|
|
|
mml2015-mailcrypt-verify
|
|
|
|
mml2015-mailcrypt-decrypt
|
|
|
|
mml2015-mailcrypt-clear-verify
|
|
|
|
mml2015-mailcrypt-clear-decrypt)
|
2010-09-26 04:03:19 +00:00
|
|
|
(pgg mml2015-pgg-sign
|
|
|
|
mml2015-pgg-encrypt
|
|
|
|
mml2015-pgg-verify
|
|
|
|
mml2015-pgg-decrypt
|
|
|
|
mml2015-pgg-clear-verify
|
|
|
|
mml2015-pgg-clear-decrypt)
|
|
|
|
(epg mml2015-epg-sign
|
|
|
|
mml2015-epg-encrypt
|
|
|
|
mml2015-epg-verify
|
|
|
|
mml2015-epg-decrypt
|
|
|
|
mml2015-epg-clear-verify
|
|
|
|
mml2015-epg-clear-decrypt))
|
2004-09-04 13:13:48 +00:00
|
|
|
"Alist of PGP/MIME functions.")
|
|
|
|
|
|
|
|
(defvar mml2015-result-buffer nil)
|
|
|
|
|
|
|
|
(defcustom mml2015-unabbrev-trust-alist
|
|
|
|
'(("TRUST_UNDEFINED" . nil)
|
|
|
|
("TRUST_NEVER" . nil)
|
|
|
|
("TRUST_MARGINAL" . t)
|
|
|
|
("TRUST_FULLY" . t)
|
|
|
|
("TRUST_ULTIMATE" . t))
|
|
|
|
"Map GnuPG trust output values to a boolean saying if you trust the key."
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
2004-09-08 18:17:56 +00:00
|
|
|
:group 'mime-security
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (cons (regexp :tag "GnuPG output regexp")
|
|
|
|
(boolean :tag "Trust key"))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom mml2015-cache-passphrase mml-secure-cache-passphrase
|
|
|
|
"If t, cache passphrase."
|
|
|
|
:group 'mime-security
|
|
|
|
:type 'boolean)
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(make-obsolete-variable 'mml2015-cache-passphrase
|
|
|
|
'mml-secure-cache-passphrase
|
|
|
|
"25.1")
|
2007-10-28 09:18:39 +00:00
|
|
|
|
|
|
|
(defcustom mml2015-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
|
|
|
|
`mml2015-cache-passphrase'."
|
|
|
|
:group 'mime-security
|
|
|
|
:type 'integer)
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(make-obsolete-variable 'mml2015-passphrase-cache-expiry
|
|
|
|
'mml-secure-passphrase-cache-expiry
|
|
|
|
"25.1")
|
2007-10-28 09:18:39 +00:00
|
|
|
|
|
|
|
(defcustom mml2015-signers nil
|
2011-02-11 20:31:35 -05:00
|
|
|
"A list of your own key ID(s) which will be used to sign a message.
|
2011-01-28 01:34:09 +00:00
|
|
|
If set, it overrides the setting of `mml2015-sign-with-sender'."
|
2007-10-28 09:18:39 +00:00
|
|
|
:group 'mime-security
|
|
|
|
:type '(repeat (string :tag "Key ID")))
|
|
|
|
|
2011-01-27 23:42:38 +00:00
|
|
|
(defcustom mml2015-sign-with-sender nil
|
|
|
|
"If t, use message sender so find a key to sign with."
|
|
|
|
:group 'mime-security
|
|
|
|
:type 'boolean
|
|
|
|
:version "24.1")
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom mml2015-encrypt-to-self nil
|
|
|
|
"If t, add your own key ID to recipient list when encryption."
|
|
|
|
:group 'mime-security
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom mml2015-always-trust t
|
|
|
|
"If t, GnuPG skip key validation on encryption."
|
|
|
|
:group 'mime-security
|
|
|
|
:type 'boolean)
|
|
|
|
|
2013-06-14 03:24:05 +00:00
|
|
|
(defcustom mml2015-maximum-key-image-dimension 64
|
|
|
|
"The maximum dimension (width or height) of any key images."
|
2013-06-13 23:51:56 -07:00
|
|
|
:version "24.4"
|
2013-06-14 03:24:05 +00:00
|
|
|
:group 'mime-security
|
|
|
|
:type 'integer)
|
|
|
|
|
2014-05-08 22:42:13 +00:00
|
|
|
(defcustom mml2015-display-key-image t
|
|
|
|
"If t, try to display key images."
|
2014-11-13 04:22:48 +00:00
|
|
|
:version "24.5"
|
2014-05-08 22:42:13 +00:00
|
|
|
:group 'mime-security
|
|
|
|
:type 'boolean)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; Extract plaintext from cleartext signature. IMO, this kind of task
|
|
|
|
;; should be done by GnuPG rather than Elisp, but older PGP backends
|
2010-09-26 04:03:19 +00:00
|
|
|
;; (such as Mailcrypt, and PGG) discard the output from GnuPG.
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun mml2015-extract-cleartext-signature ()
|
2008-03-10 00:50:22 +00:00
|
|
|
;; Daiki Ueno in
|
|
|
|
;; <54a15d860801080142l70b95d7dkac4bf51a86196011@mail.gmail.com>: ``I still
|
|
|
|
;; believe that the right way is to use the plaintext output from GnuPG as
|
|
|
|
;; it is, and mml2015-extract-cleartext-signature is just a kludge for
|
|
|
|
;; misdesigned libraries like PGG, which have no ability to do that. So, I
|
|
|
|
;; think it should not have descriptive documentation.''
|
|
|
|
;;
|
|
|
|
;; This function doesn't handle NotDashEscaped correctly. EasyPG handles it
|
|
|
|
;; correctly.
|
|
|
|
;; http://thread.gmane.org/gmane.emacs.gnus.general/66062/focus=66082
|
|
|
|
;; http://thread.gmane.org/gmane.emacs.gnus.general/65087/focus=65109
|
2007-10-28 09:18:39 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(forward-line)
|
|
|
|
;; We need to be careful not to strip beyond the armor headers.
|
|
|
|
;; Previously, an attacker could replace the text inside our
|
|
|
|
;; markup with trailing garbage by injecting whitespace into the
|
|
|
|
;; message.
|
|
|
|
(while (looking-at "Hash:") ; The only header allowed in cleartext
|
|
|
|
(forward-line)) ; signatures according to RFC2440.
|
|
|
|
(when (looking-at "[\t ]*$")
|
|
|
|
(forward-line))
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
(if (re-search-forward "^-----BEGIN PGP SIGNATURE-----" nil t)
|
|
|
|
(delete-region (match-beginning 0) (point-max)))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward "^- " nil t)
|
|
|
|
(replace-match "" t t)
|
|
|
|
(forward-line 1)))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; mailcrypt wrapper
|
|
|
|
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'mailcrypt-decrypt "mailcrypt")
|
|
|
|
(autoload 'mailcrypt-verify "mailcrypt")
|
|
|
|
(autoload 'mc-pgp-always-sign "mailcrypt")
|
|
|
|
(autoload 'mc-encrypt-generic "mc-toplev")
|
|
|
|
(autoload 'mc-cleanup-recipient-headers "mc-toplev")
|
|
|
|
(autoload 'mc-sign-generic "mc-toplev")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defvar mml2015-decrypt-function 'mailcrypt-decrypt)
|
|
|
|
(defvar mml2015-verify-function 'mailcrypt-verify)
|
|
|
|
|
|
|
|
(defun mml2015-format-error (err)
|
|
|
|
(if (stringp (cadr err))
|
|
|
|
(cadr err)
|
|
|
|
(format "%S" (cdr err))))
|
|
|
|
|
|
|
|
(defun mml2015-mailcrypt-decrypt (handle ctl)
|
|
|
|
(catch 'error
|
|
|
|
(let (child handles result)
|
|
|
|
(unless (setq child (mm-find-part-by-type
|
|
|
|
(cdr handle)
|
|
|
|
"application/octet-stream" nil t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))
|
|
|
|
(with-temp-buffer
|
|
|
|
(mm-insert-part child)
|
|
|
|
(setq result
|
|
|
|
(condition-case err
|
|
|
|
(funcall mml2015-decrypt-function)
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)))
|
|
|
|
(unless (car result)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))
|
|
|
|
(setq handles (mm-dissect-buffer t)))
|
|
|
|
(mm-destroy-parts handle)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-info
|
2004-09-04 13:13:48 +00:00
|
|
|
(concat "OK"
|
|
|
|
(let ((sig (with-current-buffer mml2015-result-buffer
|
|
|
|
(mml2015-gpg-extract-signature-details))))
|
|
|
|
(concat ", Signer: " sig))))
|
|
|
|
(if (listp (car handles))
|
|
|
|
handles
|
|
|
|
(list handles)))))
|
|
|
|
|
2010-09-26 04:03:19 +00:00
|
|
|
(defun mml2015-gpg-pretty-print-fpr (fingerprint)
|
|
|
|
(let* ((result "")
|
|
|
|
(fpr-length (string-width fingerprint))
|
|
|
|
(n-slice 0)
|
|
|
|
slice)
|
|
|
|
(setq fingerprint (string-to-list fingerprint))
|
|
|
|
(while fingerprint
|
|
|
|
(setq fpr-length (- fpr-length 4))
|
|
|
|
(setq slice (butlast fingerprint fpr-length))
|
|
|
|
(setq fingerprint (nthcdr 4 fingerprint))
|
|
|
|
(setq n-slice (1+ n-slice))
|
|
|
|
(setq result
|
|
|
|
(concat
|
|
|
|
result
|
gnus: replace cl with cl-lib
* lisp/gnus/gnus-agent.el, lisp/gnus/gnus-art.el:
* lisp/gnus/gnus-async.el, lisp/gnus/gnus-cache.el:
* lisp/gnus/gnus-demon.el, lisp/gnus/gnus-group.el:
* lisp/gnus/gnus-icalendar.el, lisp/gnus/gnus-logic.el:
* lisp/gnus/gnus-msg.el, lisp/gnus/gnus-picon.el:
* lisp/gnus/gnus-registry.el, lisp/gnus/gnus-salt.el:
* lisp/gnus/gnus-score.el, lisp/gnus/gnus-spec.el:
* lisp/gnus/gnus-srvr.el, lisp/gnus/gnus-start.el:
* lisp/gnus/gnus-sum.el, lisp/gnus/gnus-topic.el:
* lisp/gnus/gnus-util.el, lisp/gnus/gnus-uu.el, lisp/gnus/gnus-win.el:
* lisp/gnus/mail-source.el, lisp/gnus/mm-decode.el:
* lisp/gnus/mm-encode.el, lisp/gnus/mm-url.el, lisp/gnus/mm-view.el:
* lisp/gnus/mml-smime.el, lisp/gnus/mml.el, lisp/gnus/mml2015.el:
* lisp/gnus/nnbabyl.el, lisp/gnus/nndoc.el, lisp/gnus/nneething.el:
* lisp/gnus/nnheader.el, lisp/gnus/nnimap.el, lisp/gnus/nnmail.el:
* lisp/gnus/nnmaildir.el, lisp/gnus/nnoo.el, lisp/gnus/nnrss.el:
* lisp/gnus/nnspool.el, lisp/gnus/nntp.el, lisp/gnus/nnvirtual.el:
* lisp/gnus/nnweb.el, lisp/gnus/spam.el: Replace cl with cl-lib.
* lisp/gnus/canlock.el, lisp/gnus/gnus-bcklg.el:
* lisp/gnus/gnus-cite.el, lisp/gnus/gnus-cloud.el:
* lisp/gnus/gnus-draft.el, lisp/gnus/gnus-dup.el:
* lisp/gnus/gnus-fun.el, lisp/gnus/gnus-html.el:
* lisp/gnus/gnus-int.el, lisp/gnus/gnus-kill.el, lisp/gnus/gnus-ml.el:
* lisp/gnus/gnus-mlspl.el, lisp/gnus/gnus-range.el:
* lisp/gnus/gnus-undo.el, lisp/gnus/gnus-vm.el:
* lisp/gnus/mm-partial.el, lisp/gnus/mm-uu.el, lisp/gnus/mml1991.el:
* lisp/gnus/nnagent.el, lisp/gnus/nndiary.el, lisp/gnus/nndir.el:
* lisp/gnus/nndraft.el, lisp/gnus/nnfolder.el, lisp/gnus/nngateway.el:
* lisp/gnus/nnmairix.el, lisp/gnus/nnmbox.el, lisp/gnus/nnmh.el:
* lisp/gnus/nnml.el, lisp/gnus/score-mode.el, lisp/gnus/smiley.el:
No need for cl.
2018-03-23 16:13:09 -04:00
|
|
|
(cl-case n-slice
|
2010-09-26 04:03:19 +00:00
|
|
|
(1 slice)
|
|
|
|
(otherwise (concat " " slice))))))
|
|
|
|
result))
|
|
|
|
|
|
|
|
(defun mml2015-gpg-extract-signature-details ()
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let* ((expired (re-search-forward
|
|
|
|
"^\\[GNUPG:\\] SIGEXPIRED$"
|
|
|
|
nil t))
|
|
|
|
(signer (and (re-search-forward
|
|
|
|
"^\\[GNUPG:\\] GOODSIG \\([0-9A-Za-z]*\\) \\(.*\\)$"
|
|
|
|
nil t)
|
|
|
|
(cons (match-string 1) (match-string 2))))
|
|
|
|
(fprint (and (re-search-forward
|
|
|
|
"^\\[GNUPG:\\] VALIDSIG \\([0-9a-zA-Z]*\\) "
|
|
|
|
nil t)
|
|
|
|
(match-string 1)))
|
|
|
|
(trust (and (re-search-forward
|
|
|
|
"^\\[GNUPG:\\] \\(TRUST_.*\\)$"
|
|
|
|
nil t)
|
|
|
|
(match-string 1)))
|
|
|
|
(trust-good-enough-p
|
|
|
|
(cdr (assoc trust mml2015-unabbrev-trust-alist))))
|
|
|
|
(cond ((and signer fprint)
|
|
|
|
(concat (cdr signer)
|
|
|
|
(unless trust-good-enough-p
|
|
|
|
(concat "\nUntrusted, Fingerprint: "
|
|
|
|
(mml2015-gpg-pretty-print-fpr fprint)))
|
|
|
|
(when expired
|
|
|
|
(format "\nWARNING: Signature from expired key (%s)"
|
|
|
|
(car signer)))))
|
|
|
|
((re-search-forward
|
|
|
|
"^\\(gpg: \\)?Good signature from \"\\(.*\\)\"$" nil t)
|
|
|
|
(match-string 2))
|
|
|
|
(t
|
|
|
|
"From unknown user"))))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml2015-mailcrypt-clear-decrypt ()
|
|
|
|
(let (result)
|
|
|
|
(setq result
|
|
|
|
(condition-case err
|
|
|
|
(funcall mml2015-decrypt-function)
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)))
|
|
|
|
(if (car result)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK")
|
|
|
|
(mm-sec-error 'gnus-info "Failed"))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun mml2015-fix-micalg (alg)
|
|
|
|
(and alg
|
|
|
|
;; Mutt/1.2.5i has seen sending micalg=php-sha1
|
|
|
|
(upcase (if (string-match "^p[gh]p-" alg)
|
|
|
|
(substring alg (match-end 0))
|
|
|
|
alg))))
|
|
|
|
|
2020-01-30 11:27:55 -05:00
|
|
|
(autoload 'gnus-get-buffer-create "gnus")
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml2015-mailcrypt-verify (handle ctl)
|
|
|
|
(catch 'error
|
|
|
|
(let (part)
|
|
|
|
(unless (setq part (mm-find-raw-part-by-type
|
|
|
|
ctl (or (mm-handle-multipart-ctl-parameter
|
|
|
|
ctl 'protocol)
|
|
|
|
"application/pgp-signature")
|
|
|
|
t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert "-----BEGIN PGP SIGNED MESSAGE-----\n")
|
|
|
|
(insert (format "Hash: %s\n\n"
|
|
|
|
(or (mml2015-fix-micalg
|
|
|
|
(mm-handle-multipart-ctl-parameter
|
|
|
|
ctl 'micalg))
|
|
|
|
"SHA1")))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
(insert part "\n")
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
|
|
|
(if (looking-at "^-")
|
|
|
|
(insert "- "))
|
|
|
|
(forward-line)))
|
|
|
|
(unless (setq part (mm-find-part-by-type
|
|
|
|
(cdr handle) "application/pgp-signature" nil t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point))
|
|
|
|
(mm-insert-part part)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (re-search-forward "^-----BEGIN PGP [^-]+-----\r?$" nil t)
|
|
|
|
(replace-match "-----BEGIN PGP SIGNATURE-----" t t))
|
|
|
|
(if (re-search-forward "^-----END PGP [^-]+-----\r?$" nil t)
|
|
|
|
(replace-match "-----END PGP SIGNATURE-----" t t)))
|
2020-01-10 13:34:59 -05:00
|
|
|
(let ((mc-gpg-debug-buffer (gnus-get-buffer-create " *gnus gpg debug*")))
|
2004-09-04 13:13:48 +00:00
|
|
|
(unless (condition-case err
|
|
|
|
(prog1
|
|
|
|
(funcall mml2015-verify-function)
|
|
|
|
(if (get-buffer " *mailcrypt stderr temp")
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error
|
|
|
|
'gnus-details
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-current-buffer " *mailcrypt stderr temp"
|
|
|
|
(buffer-string))))
|
|
|
|
(if (get-buffer " *mailcrypt stdout temp")
|
|
|
|
(kill-buffer " *mailcrypt stdout temp"))
|
|
|
|
(if (get-buffer " *mailcrypt stderr temp")
|
|
|
|
(kill-buffer " *mailcrypt stderr temp"))
|
|
|
|
(if (get-buffer " *mailcrypt status temp")
|
|
|
|
(kill-buffer " *mailcrypt status temp"))
|
|
|
|
(if (get-buffer mc-gpg-debug-buffer)
|
|
|
|
(kill-buffer mc-gpg-debug-buffer)))
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK")
|
2004-09-04 13:13:48 +00:00
|
|
|
handle)))
|
|
|
|
|
|
|
|
(defun mml2015-mailcrypt-clear-verify ()
|
2020-01-10 13:34:59 -05:00
|
|
|
(let ((mc-gpg-debug-buffer (gnus-get-buffer-create " *gnus gpg debug*")))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (condition-case err
|
|
|
|
(prog1
|
|
|
|
(funcall mml2015-verify-function)
|
|
|
|
(if (get-buffer " *mailcrypt stderr temp")
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error
|
|
|
|
'gnus-details
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-current-buffer " *mailcrypt stderr temp"
|
|
|
|
(buffer-string))))
|
|
|
|
(if (get-buffer " *mailcrypt stdout temp")
|
|
|
|
(kill-buffer " *mailcrypt stdout temp"))
|
|
|
|
(if (get-buffer " *mailcrypt stderr temp")
|
|
|
|
(kill-buffer " *mailcrypt stderr temp"))
|
|
|
|
(if (get-buffer " *mailcrypt status temp")
|
|
|
|
(kill-buffer " *mailcrypt status temp"))
|
|
|
|
(if (get-buffer mc-gpg-debug-buffer)
|
|
|
|
(kill-buffer mc-gpg-debug-buffer)))
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK")
|
|
|
|
(mm-sec-error 'gnus-info "Failed")))
|
2007-10-28 09:18:39 +00:00
|
|
|
(mml2015-extract-cleartext-signature))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun mml2015-mailcrypt-sign (cont)
|
|
|
|
(mc-sign-generic (message-options-get 'message-sender)
|
|
|
|
nil nil nil nil)
|
|
|
|
(let ((boundary (mml-compute-boundary cont))
|
|
|
|
hash point)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(unless (re-search-forward "^-----BEGIN PGP SIGNED MESSAGE-----\r?$" nil t)
|
|
|
|
(error "Cannot find signed begin line"))
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(forward-line 1)
|
|
|
|
(unless (looking-at "Hash:[ \t]*\\([a-zA-Z0-9]+\\)")
|
|
|
|
(error "Cannot not find PGP hash"))
|
|
|
|
(setq hash (match-string 1))
|
|
|
|
(unless (re-search-forward "^$" nil t)
|
|
|
|
(error "Cannot not find PGP message"))
|
|
|
|
(forward-line 1)
|
|
|
|
(delete-region (point-min) (point))
|
|
|
|
(insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
|
|
|
|
boundary))
|
|
|
|
(insert (format "\tmicalg=pgp-%s; protocol=\"application/pgp-signature\"\n"
|
|
|
|
(downcase hash)))
|
|
|
|
(insert (format "\n--%s\n" boundary))
|
|
|
|
(setq point (point))
|
|
|
|
(goto-char (point-max))
|
|
|
|
(unless (re-search-backward "^-----END PGP SIGNATURE-----\r?$" nil t)
|
|
|
|
(error "Cannot find signature part"))
|
|
|
|
(replace-match "-----END PGP MESSAGE-----" t t)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(unless (re-search-backward "^-----BEGIN PGP SIGNATURE-----\r?$"
|
|
|
|
nil t)
|
|
|
|
(error "Cannot find signature part"))
|
|
|
|
(replace-match "-----BEGIN PGP MESSAGE-----" t t)
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region point (point))
|
|
|
|
(goto-char point)
|
|
|
|
(while (re-search-forward "^- -" nil t)
|
|
|
|
(replace-match "-" t t))
|
|
|
|
(goto-char (point-max)))
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/pgp-signature\n\n")
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "--%s--\n" boundary))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
2007-12-11 05:26:52 +00:00
|
|
|
;; We require mm-decode, which requires mm-bodies, which autoloads
|
|
|
|
;; message-options-get (!).
|
|
|
|
(declare-function message-options-set "message" (symbol value))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml2015-mailcrypt-encrypt (cont &optional sign)
|
|
|
|
(let ((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)))
|
2016-02-12 15:57:13 +11:00
|
|
|
(insert
|
|
|
|
(with-temp-buffer
|
|
|
|
(set-buffer-multibyte nil)
|
|
|
|
(mc-encrypt-generic
|
|
|
|
(or (message-options-get 'message-recipients)
|
|
|
|
(message-options-set 'message-recipients
|
|
|
|
(mc-cleanup-recipient-headers
|
|
|
|
(read-string "Recipients: "))))
|
|
|
|
nil nil nil
|
|
|
|
(message-options-get 'message-sender))
|
|
|
|
(buffer-string))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(unless (looking-at "-----BEGIN PGP MESSAGE-----")
|
|
|
|
(error "Fail to encrypt the message"))
|
|
|
|
(let ((boundary (mml-compute-boundary cont)))
|
|
|
|
(insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n"
|
|
|
|
boundary))
|
|
|
|
(insert "\tprotocol=\"application/pgp-encrypted\"\n\n")
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/pgp-encrypted\n\n")
|
|
|
|
(insert "Version: 1\n\n")
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/octet-stream\n\n")
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "--%s--\n" boundary))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
|
|
|
;;; pgg wrapper
|
|
|
|
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
(defvar pgg-default-user-id)
|
|
|
|
(defvar pgg-errors-buffer)
|
|
|
|
(defvar pgg-output-buffer)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'pgg-decrypt-region "pgg")
|
|
|
|
(autoload 'pgg-verify-region "pgg")
|
|
|
|
(autoload 'pgg-sign-region "pgg")
|
|
|
|
(autoload 'pgg-encrypt-region "pgg")
|
|
|
|
(autoload 'pgg-parse-armor "pgg-parse")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun mml2015-pgg-decrypt (handle ctl)
|
|
|
|
(catch 'error
|
|
|
|
(let ((pgg-errors-buffer mml2015-result-buffer)
|
|
|
|
child handles result decrypt-status)
|
|
|
|
(unless (setq child (mm-find-part-by-type
|
|
|
|
(cdr handle)
|
|
|
|
"application/octet-stream" nil t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))
|
|
|
|
(with-temp-buffer
|
|
|
|
(mm-insert-part child)
|
|
|
|
(if (condition-case err
|
|
|
|
(prog1
|
|
|
|
(pgg-decrypt-region (point-min) (point-max))
|
2005-02-09 15:50:47 +00:00
|
|
|
(setq decrypt-status
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-current-buffer mml2015-result-buffer
|
|
|
|
(buffer-string)))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-details decrypt-status))
|
2004-09-04 13:13:48 +00:00
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
|
|
|
(with-current-buffer pgg-output-buffer
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
(replace-match "\n" t t))
|
|
|
|
(setq handles (mm-dissect-buffer t))
|
|
|
|
(mm-destroy-parts handle)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK"
|
|
|
|
'gnus-details
|
|
|
|
(concat decrypt-status
|
|
|
|
(when (stringp (car handles))
|
|
|
|
"\n" (mm-handle-multipart-ctl-parameter
|
|
|
|
handles 'gnus-details))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (listp (car handles))
|
|
|
|
handles
|
|
|
|
(list handles)))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2004-09-04 13:13:48 +00:00
|
|
|
(throw 'error handle))))))
|
|
|
|
|
|
|
|
(defun mml2015-pgg-clear-decrypt ()
|
|
|
|
(let ((pgg-errors-buffer mml2015-result-buffer))
|
|
|
|
(if (prog1
|
|
|
|
(pgg-decrypt-region (point-min) (point-max))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-details
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-current-buffer mml2015-result-buffer
|
|
|
|
(buffer-string))))
|
|
|
|
(progn
|
|
|
|
(erase-buffer)
|
2006-05-02 05:25:20 +00:00
|
|
|
;; Treat data which pgg returns as a unibyte string.
|
|
|
|
(mm-disable-multibyte)
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert-buffer-substring pgg-output-buffer)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
(replace-match "\n" t t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK"))
|
|
|
|
(mm-sec-error 'gnus-info "Failed"))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun mml2015-pgg-verify (handle ctl)
|
|
|
|
(let ((pgg-errors-buffer mml2015-result-buffer)
|
|
|
|
signature-file part signature)
|
|
|
|
(if (or (null (setq part (mm-find-raw-part-by-type
|
|
|
|
ctl (or (mm-handle-multipart-ctl-parameter
|
|
|
|
ctl 'protocol)
|
|
|
|
"application/pgp-signature")
|
|
|
|
t)))
|
2019-09-30 08:41:43 +02:00
|
|
|
(null (setq signature
|
|
|
|
(mm-find-part-by-type
|
|
|
|
(cdr handle) "application/pgp-signature" nil t))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(progn
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2004-09-04 13:13:48 +00:00
|
|
|
handle)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert part)
|
2007-10-28 09:18:39 +00:00
|
|
|
;; Convert <LF> to <CR><LF> in signed text. If --textmode is
|
|
|
|
;; specified when signing, the conversion is not necessary.
|
2004-09-04 13:13:48 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(end-of-line)
|
|
|
|
(while (not (eobp))
|
|
|
|
(unless (eq (char-before) ?\r)
|
|
|
|
(insert "\r"))
|
|
|
|
(forward-line)
|
|
|
|
(end-of-line))
|
2016-02-12 14:39:30 +11:00
|
|
|
(with-temp-file (setq signature-file (make-temp-file "pgg"))
|
2004-09-04 13:13:48 +00:00
|
|
|
(mm-insert-part signature))
|
|
|
|
(if (condition-case err
|
|
|
|
(prog1
|
2005-02-09 15:50:47 +00:00
|
|
|
(pgg-verify-region (point-min) (point-max)
|
2004-09-04 13:13:48 +00:00
|
|
|
signature-file t)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
(replace-match "\n" t t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-details
|
2004-09-04 13:13:48 +00:00
|
|
|
(concat (with-current-buffer pgg-output-buffer
|
|
|
|
(buffer-string))
|
|
|
|
(with-current-buffer pgg-errors-buffer
|
|
|
|
(buffer-string)))))
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
|
|
|
(progn
|
|
|
|
(delete-file signature-file)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error
|
|
|
|
'gnus-info
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-current-buffer pgg-errors-buffer
|
|
|
|
(mml2015-gpg-extract-signature-details))))
|
|
|
|
(delete-file signature-file)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")))))
|
2004-09-04 13:13:48 +00:00
|
|
|
handle)
|
|
|
|
|
|
|
|
(defun mml2015-pgg-clear-verify ()
|
|
|
|
(let ((pgg-errors-buffer mml2015-result-buffer)
|
|
|
|
(text (buffer-string))
|
|
|
|
(coding-system buffer-file-coding-system))
|
|
|
|
(if (condition-case err
|
|
|
|
(prog1
|
|
|
|
(mm-with-unibyte-buffer
|
2016-02-12 14:39:30 +11:00
|
|
|
(insert (encode-coding-string text coding-system))
|
2004-09-04 13:13:48 +00:00
|
|
|
(pgg-verify-region (point-min) (point-max) nil t))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
(replace-match "\n" t t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-details
|
2004-09-04 13:13:48 +00:00
|
|
|
(concat (with-current-buffer pgg-output-buffer
|
|
|
|
(buffer-string))
|
|
|
|
(with-current-buffer pgg-errors-buffer
|
|
|
|
(buffer-string)))))
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details (mml2015-format-error err))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil)
|
|
|
|
(quit
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-details "Quit.")
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-info
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-current-buffer pgg-errors-buffer
|
|
|
|
(mml2015-gpg-extract-signature-details)))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")))
|
2007-10-28 09:18:39 +00:00
|
|
|
(mml2015-extract-cleartext-signature))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun mml2015-pgg-sign (cont)
|
|
|
|
(let ((pgg-errors-buffer mml2015-result-buffer)
|
|
|
|
(boundary (mml-compute-boundary cont))
|
|
|
|
(pgg-default-user-id (or (message-options-get 'mml-sender)
|
2005-08-07 23:56:33 +00:00
|
|
|
pgg-default-user-id))
|
2006-02-10 05:08:29 +00:00
|
|
|
(pgg-text-mode t)
|
2005-08-07 23:56:33 +00:00
|
|
|
entry)
|
2004-09-04 13:13:48 +00:00
|
|
|
(unless (pgg-sign-region (point-min) (point-max))
|
|
|
|
(pop-to-buffer mml2015-result-buffer)
|
|
|
|
(error "Sign error"))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
|
|
|
|
boundary))
|
2005-08-07 23:56:33 +00:00
|
|
|
(if (setq entry (assq 2 (pgg-parse-armor
|
|
|
|
(with-current-buffer pgg-output-buffer
|
|
|
|
(buffer-string)))))
|
|
|
|
(setq entry (assq 'hash-algorithm (cdr entry))))
|
|
|
|
(insert (format "\tmicalg=%s; "
|
|
|
|
(if (cdr entry)
|
|
|
|
(downcase (format "pgp-%s" (cdr entry)))
|
|
|
|
"pgp-sha1")))
|
|
|
|
(insert "protocol=\"application/pgp-signature\"\n")
|
2004-09-04 13:13:48 +00:00
|
|
|
(insert (format "\n--%s\n" boundary))
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "\n--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/pgp-signature\n\n")
|
|
|
|
(insert-buffer-substring pgg-output-buffer)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "--%s--\n" boundary))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
|
|
|
(defun mml2015-pgg-encrypt (cont &optional sign)
|
|
|
|
(let ((pgg-errors-buffer mml2015-result-buffer)
|
2006-02-10 05:08:29 +00:00
|
|
|
(pgg-text-mode t)
|
2004-09-04 13:13:48 +00:00
|
|
|
(boundary (mml-compute-boundary cont)))
|
|
|
|
(unless (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 mml2015-result-buffer)
|
|
|
|
(error "Encrypt error"))
|
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n"
|
|
|
|
boundary))
|
|
|
|
(insert "\tprotocol=\"application/pgp-encrypted\"\n\n")
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/pgp-encrypted\n\n")
|
|
|
|
(insert "Version: 1\n\n")
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/octet-stream\n\n")
|
|
|
|
(insert-buffer-substring pgg-output-buffer)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "--%s--\n" boundary))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;; epg wrapper
|
|
|
|
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
(defvar epg-user-id-alist)
|
|
|
|
(defvar epg-digest-algorithm-alist)
|
2012-12-26 13:20:21 +09:00
|
|
|
(defvar epg-gpg-program)
|
* smime.el (from):
* rfc2047.el (message-posting-charset):
* qp.el (mm-use-ultra-safe-encoding):
* pop3.el (parse-time-months):
* nnrss.el (mm-text-html-renderer, mm-text-html-washer-alist):
* nnml.el (files):
* nnheader.el (gnus-newsgroup-name, nnheader-file-coding-system)
(jka-compr-compression-info-list, ange-ftp-path-format)
(efs-path-regexp):
* nndiary.el (files):
* mml2015.el (mc-default-scheme, mc-schemes, pgg-default-user-id)
(pgg-errors-buffer, pgg-output-buffer, epg-user-id-alist)
(epg-digest-algorithm-alist, inhibit-redisplay)
(password-cache-expiry):
* mml1991.el (pgg-default-user-id, pgg-errors-buffer)
(pgg-output-buffer, password-cache-expiry):
* mml.el (mml-dnd-protocol-alist, ange-ftp-name-format)
(efs-path-regexp):
* mml-smime.el (epg-user-id-alist, epg-digest-algorithm-alist)
(inhibit-redisplay):
* mm-uu.el (file-name, start-point, end-point, entry)
(gnus-newsgroup-name, gnus-newsgroup-charset):
* mm-util.el (mm-mime-mule-charset-alist, latin-unity-coding-systems)
(latin-unity-ucs-list):
* mm-bodies.el (mm-uu-yenc-decode-function, mm-uu-decode-function)
(mm-uu-binhex-decode-function):
* message.el (gnus-message-group-art, gnus-list-identifiers, )
(rmail-enable-mime-composing, gnus-local-organization)
(gnus-post-method, gnus-select-method, gnus-active-hashtb)
(gnus-read-active-file, facemenu-add-face-function)
(facemenu-remove-face-function, gnus-article-decoded-p)
(tool-bar-mode):
* mail-source.el (display-time-mail-function):
* gnus-util.el (nnmail-pathname-coding-system)
(nnmail-active-file-coding-system, gnus-emphasize-whitespace-regexp)
(gnus-original-article-buffer, gnus-user-agent)
(rmail-default-rmail-file, mm-text-coding-system, tool-bar-mode)
(xemacs-codename, sxemacs-codename, emacs-program-version):
* gnus-sum.el (tool-bar-mode, gnus-tmp-header, number):
* gnus-start.el (gnus-agent-covered-methods)
(gnus-agent-file-loading-local, gnus-agent-file-loading-cache)
(gnus-current-headers, gnus-thread-indent-array, gnus-newsgroup-name)
(gnus-newsgroup-headers, gnus-group-list-mode)
(gnus-group-mark-positions, gnus-newsgroup-data)
(gnus-newsgroup-unreads, nnoo-state-alist)
(gnus-current-select-method, mail-sources)
(nnmail-scan-directory-mail-source-once, nnmail-split-history)
(nnmail-spool-file, gnus-cache-active-hashtb):
* gnus-mh.el (mh-lib-progs):
* gnus-ems.el (gnus-tmp-unread, gnus-tmp-replied)
(gnus-tmp-score-char, gnus-tmp-indentation, gnus-tmp-opening-bracket)
(gnus-tmp-lines, gnus-tmp-name, gnus-tmp-closing-bracket)
(gnus-tmp-subject-or-nil, gnus-check-before-posting, gnus-mouse-face)
(gnus-group-buffer):
* gnus-cite.el (font-lock-defaults-computed, font-lock-keywords)
(font-lock-set-defaults):
* gnus-art.el (tool-bar-map, w3m-minor-mode-map)
(gnus-face-properties-alist, charset, gnus-summary-article-menu)
(gnus-summary-post-menu, total-parts, type, condition, length):
* gnus-agent.el (gnus-agent-read-agentview):
* flow-fill.el (show-trailing-whitespace):
* gnus-group.el (tool-bar-mode, nnrss-group-alist): Remove unnecessary
eval-and-compile wrappers for byte compiler pacifiers.
* mm-view.el (mm-inline-image-xemacs): Only do something for XEmacs.
(mm-display-inline-fontify): Check for featurep 'xemacs not
extent-list.
* mm-decode.el (mm-display-external): Check for featurep 'xemacs not
itimer-list.
(mm-create-image-xemacs): Only do something for XEmacs.
(mm-image-fit-p): Check for featurep 'xemacs not glyph-width.
* mm-util.el (mm-find-buffer-file-coding-system): Add check for XEmacs.
* gnus-registry.el (gnus-adaptive-word-syntax-table):
* gnus-fun.el (gnus-face-properties-alist): Pacify byte compiler.
* textmodes/reftex-dcr.el (reftex-start-itimer-once): Add check
for XEmacs.
* calc/calc-menu.el (calc-mode-map): Pacify byte compiler.
* doc-view.el (doc-view-resolution): Add missing :group.
2007-11-16 16:50:35 +00:00
|
|
|
(defvar inhibit-redisplay)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'epg-make-context "epg")
|
|
|
|
(autoload 'epg-context-set-armor "epg")
|
|
|
|
(autoload 'epg-context-set-textmode "epg")
|
|
|
|
(autoload 'epg-context-set-signers "epg")
|
|
|
|
(autoload 'epg-context-result-for "epg")
|
|
|
|
(autoload 'epg-new-signature-digest-algorithm "epg")
|
|
|
|
(autoload 'epg-list-keys "epg")
|
|
|
|
(autoload 'epg-decrypt-string "epg")
|
|
|
|
(autoload 'epg-verify-string "epg")
|
|
|
|
(autoload 'epg-sign-string "epg")
|
|
|
|
(autoload 'epg-encrypt-string "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")
|
2011-01-07 18:28:29 +09:00
|
|
|
(autoload 'epg-sub-key-fingerprint "epg")
|
2012-12-26 13:20:21 +09:00
|
|
|
(autoload 'epg-signature-key-id "epg")
|
|
|
|
(autoload 'epg-signature-to-string "epg")
|
2013-02-17 12:46:28 +00:00
|
|
|
(autoload 'epg-key-user-id-list "epg")
|
|
|
|
(autoload 'epg-user-id-string "epg")
|
|
|
|
(autoload 'epg-user-id-validity "epg")
|
2008-06-11 03:13:28 +00:00
|
|
|
(autoload 'epg-configuration "epg-config")
|
|
|
|
(autoload 'epg-expand-group "epg-config")
|
|
|
|
(autoload 'epa-select-keys "epa")
|
2007-10-28 09:18:39 +00:00
|
|
|
|
2020-01-30 11:27:55 -05:00
|
|
|
(autoload 'gnus-create-image "gnus-util")
|
|
|
|
|
2012-12-26 13:20:21 +09:00
|
|
|
(defun mml2015-epg-key-image (key-id)
|
lisp/*.el: Fix typos and other trivial doc fixes
* lisp/allout-widgets.el (allout-widgets-auto-activation)
(allout-current-decorated-p):
* lisp/auth-source.el (auth-source-protocols):
* lisp/autorevert.el (auto-revert-set-timer):
* lisp/battery.el (battery-mode-line-limit):
* lisp/calc/calcalg3.el (math-map-binop):
* lisp/calendar/cal-dst.el (calendar-dst-find-startend):
* lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute):
* lisp/calendar/calendar.el (calendar-date-echo-text)
(calendar-generate-month, calendar-string-spread)
(calendar-cursor-to-date, calendar-read, calendar-read-date)
(calendar-mark-visible-date, calendar-dayname-on-or-before):
* lisp/calendar/diary-lib.el (diary-ordinal-suffix):
* lisp/cedet/ede/autoconf-edit.el (autoconf-new-program)
(autoconf-find-last-macro, autoconf-parameter-strip):
* lisp/cedet/ede/config.el (ede-target-with-config-build):
* lisp/cedet/ede/linux.el (ede-linux--detect-architecture)
(ede-linux--get-architecture):
* lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache)
(semantic-displayer-abstract, semantic-displayer-point-position):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic-format-tag-short-doc):
* lisp/cedet/semantic/fw.el (semantic-find-file-noselect):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time)
(semantic-idle-breadcrumbs-display-function)
(semantic-idle-breadcrumbs-format-tag-list-function):
* lisp/cedet/semantic/lex.el (semantic-lex-map-types)
(define-lex, define-lex-block-type-analyzer):
* lisp/cedet/semantic/senator.el (senator-search-default-tag-filter):
* lisp/cedet/semantic/symref.el (semantic-symref-result)
(semantic-symref-hit-to-tag-via-db):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-new-variable)
(semantic-tag-new-include, semantic-tag-new-package)
(semantic-tag-set-faux, semantic-create-tag-proxy)
(semantic-tag-function-parent)
(semantic-tag-components-with-overlays):
* lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces)
(srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary)
(srecode-dictionary-add-entries, srecode-dictionary-lookup-name)
(srecode-create-dictionaries-from-tags):
* lisp/cmuscheme.el (scheme-compile-region):
* lisp/color.el (color-lab-to-lch):
* lisp/doc-view.el (doc-view-image-width)
(doc-view-set-up-single-converter):
* lisp/dynamic-setting.el (font-setting-change-default-font)
(dynamic-setting-handle-config-changed-event):
* lisp/elec-pair.el (electric-pair-text-pairs)
(electric-pair-skip-whitespace-function)
(electric-pair-string-bound-function):
* lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance)
(avl-tree-member, avl-tree-mapcar, avl-tree-iter):
* lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree):
* lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag)
(checkdoc-spellcheck-documentation-flag, checkdoc-ispell)
(checkdoc-ispell-current-buffer, checkdoc-ispell-interactive)
(checkdoc-ispell-message-interactive)
(checkdoc-ispell-message-text, checkdoc-ispell-start)
(checkdoc-ispell-continue, checkdoc-ispell-comments)
(checkdoc-ispell-defun):
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method):
* lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group):
* lisp/emacs-lisp/lisp.el (forward-sexp, up-list):
* lisp/emacs-lisp/package-x.el (package--archive-contents-from-file):
* lisp/emacs-lisp/package.el (package-desc)
(package--make-autoloads-and-stuff, package-hidden-regexps):
* lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup):
* lisp/emacs-lisp/testcover.el (testcover-nohits)
(testcover-1value):
* lisp/epg.el (epg-receive-keys, epg-start-edit-key):
* lisp/erc/erc-backend.el (erc-server-processing-p)
(erc-split-line-length, erc-server-coding-system)
(erc-server-send, erc-message):
* lisp/erc/erc-button.el (erc-button-face, erc-button-alist)
(erc-browse-emacswiki):
* lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login):
* lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation):
* lisp/erc/erc-log.el (erc-current-logfile):
* lisp/erc/erc-match.el (erc-log-match-format)
(erc-text-matched-hook):
* lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug):
* lisp/erc/erc-networks.el (erc-server-alist)
(erc-networks-alist, erc-current-network):
* lisp/erc/erc-ring.el (erc-input-ring-index):
* lisp/erc/erc-speedbar.el (erc-speedbar)
(erc-speedbar-update-channel):
* lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag):
* lisp/erc/erc-track.el (erc-track-position-in-mode-line)
(erc-track-remove-from-mode-line, erc-modified-channels-update)
(erc-track-last-non-erc-buffer, erc-track-sort-by-importance)
(erc-track-get-active-buffer):
* lisp/erc/erc.el (erc-get-channel-user-list)
(erc-echo-notice-hook, erc-echo-notice-always-hook)
(erc-wash-quit-reason, erc-format-@nick):
* lisp/ffap.el (ffap-latex-mode):
* lisp/files.el (abort-if-file-too-large)
(dir-locals--get-sort-score, buffer-stale--default-function):
* lisp/filesets.el (filesets-tree-max-level, filesets-data)
(filesets-update-pre010505):
* lisp/gnus/gnus-agent.el (gnus-agent-flush-cache):
* lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol)
(gnus-button-prefer-mid-or-mail):
* lisp/gnus/gnus-cus.el (gnus-group-parameters):
* lisp/gnus/gnus-demon.el (gnus-demon-handlers)
(gnus-demon-run-callback):
* lisp/gnus/gnus-dired.el (gnus-dired-print):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer):
* lisp/gnus/gnus-range.el (gnus-range-normalize):
* lisp/gnus/gnus-spec.el (gnus-pad-form):
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
(gnus-server-opened, gnus-server-closed, gnus-server-denied)
(gnus-server-offline):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir)
(gnus-refer-thread-limit-to-thread)
(gnus-summary-limit-include-thread, gnus-summary-refer-thread)
(gnus-summary-find-matching):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server):
* lisp/gnus/mail-source.el (mail-source-incoming-file-prefix):
* lisp/gnus/message.el (message-cite-reply-position)
(message-cite-style-outlook, message-cite-style-thunderbird)
(message-cite-style-gmail, message--send-mail-maybe-partially):
* lisp/gnus/mm-extern.el (mm-inline-external-body):
* lisp/gnus/mm-partial.el (mm-inline-partial):
* lisp/gnus/mml-sec.el (mml-secure-message-sign)
(mml-secure-message-sign-encrypt, mml-secure-message-encrypt):
* lisp/gnus/mml2015.el (mml2015-epg-key-image)
(mml2015-epg-key-image-to-string):
* lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail):
* lisp/gnus/nnheader.el (nnheader-directory-files-is-safe):
* lisp/gnus/nnir.el (nnir-search-history)
(nnir-imap-search-other, nnir-artlist-length)
(nnir-artlist-article, nnir-artitem-group, nnir-artitem-number)
(nnir-artitem-rsv, nnir-article-group, nnir-article-number)
(nnir-article-rsv, nnir-article-ids, nnir-categorize)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-hyrex-additional-switches)
(gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms)
(nnir-read-parm, nnir-read-server-parm, nnir-search-thread):
* lisp/gnus/nnmairix.el (nnmairix-default-group)
(nnmairix-propagate-marks):
* lisp/gnus/smime.el (smime-keys, smime-crl-check)
(smime-verify-buffer, smime-noverify-buffer):
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url):
* lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header)
(spam-spamassassin-spam-status-header, spam-sa-learn-rebuild)
(spam-classifications, spam-check-stat, spam-spamassassin-score):
* lisp/help.el (describe-minor-mode-from-symbol):
* lisp/hippie-exp.el (hippie-expand-ignore-buffers):
* lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face)
(hfy-begin-span):
* lisp/ibuf-ext.el (ibuffer-update-saved-filters-format)
(ibuffer-saved-filters, ibuffer-old-saved-filters-warning)
(ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters)
(eval, ibuffer-unary-operand, file-extension, directory):
* lisp/image-dired.el (image-dired-cmd-pngcrush-options):
* lisp/image-mode.el (image-toggle-display):
* lisp/international/ccl.el (ccl-compile-read-multibyte-character)
(ccl-compile-write-multibyte-character):
* lisp/international/kkc.el (kkc-save-init-file):
* lisp/international/latin1-disp.el (latin1-display):
* lisp/international/ogonek.el (ogonek-name-encoding-alist)
(ogonek-information, ogonek-lookup-encoding)
(ogonek-deprefixify-region):
* lisp/isearch.el (isearch-filter-predicate)
(isearch--momentary-message):
* lisp/jsonrpc.el (jsonrpc-connection-send)
(jsonrpc-process-connection, jsonrpc-shutdown)
(jsonrpc--async-request-1):
* lisp/language/tibet-util.el (tibetan-char-p):
* lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date)
(feedmail-last-chance-hook, feedmail-before-fcc-hook)
(feedmail-send-it-immediately-wrapper, feedmail-find-eoh):
* lisp/mail/hashcash.el (hashcash-generate-payment)
(hashcash-generate-payment-async, hashcash-insert-payment)
(hashcash-verify-payment):
* lisp/mail/rmail.el (rmail-movemail-variant-in-use)
(rmail-get-attr-value):
* lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime):
* lisp/mail/rmailsum.el (rmail-summary-show-message):
* lisp/mail/supercite.el (sc-raw-mode-toggle):
* lisp/man.el (Man-start-calling):
* lisp/mh-e/mh-acros.el (mh-do-at-event-location)
(mh-iterate-on-messages-in-region, mh-iterate-on-range):
* lisp/mh-e/mh-alias.el (mh-alias-system-aliases)
(mh-alias-reload, mh-alias-ali)
(mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file)
(mh-alias-add-alias):
* lisp/mouse.el (mouse-save-then-kill):
* lisp/net/browse-url.el (browse-url-default-macosx-browser):
* lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value)
(eudc-variable-server-value, eudc-update-variable)
(eudc-expand-inline):
* lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
* lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list):
* lisp/net/pop3.el (pop3-list):
* lisp/net/soap-client.el (soap-namespace-put)
(soap-xs-parse-sequence, soap-parse-envelope):
* lisp/net/soap-inspect.el (soap-inspect-xs-complex-type):
* lisp/nxml/rng-xsd.el (rng-xsd-date-to-days):
* lisp/org/ob-C.el (org-babel-prep-session:C)
(org-babel-load-session:C):
* lisp/org/ob-J.el (org-babel-execute:J):
* lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* lisp/org/ob-core.el (org-babel-process-file-name):
* lisp/org/ob-ebnf.el (org-babel-execute:ebnf):
* lisp/org/ob-forth.el (org-babel-execute:forth):
* lisp/org/ob-fortran.el (org-babel-execute:fortran)
(org-babel-prep-session:fortran, org-babel-load-session:fortran):
* lisp/org/ob-groovy.el (org-babel-execute:groovy):
* lisp/org/ob-io.el (org-babel-execute:io):
* lisp/org/ob-js.el (org-babel-execute:js):
* lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond)
(org-babel-lilypond-compile-post-tangle)
(org-babel-lilypond-display-pdf-post-tangle)
(org-babel-lilypond-tangle)
(org-babel-lilypond-execute-tangled-ly)
(org-babel-lilypond-compile-lilyfile)
(org-babel-lilypond-check-for-compile-error)
(org-babel-lilypond-process-compile-error)
(org-babel-lilypond-mark-error-line)
(org-babel-lilypond-parse-error-line)
(org-babel-lilypond-attempt-to-open-pdf)
(org-babel-lilypond-attempt-to-play-midi)
(org-babel-lilypond-switch-extension)
(org-babel-lilypond-set-header-args):
* lisp/org/ob-lua.el (org-babel-prep-session:lua):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-processing.el (org-babel-prep-session:processing):
* lisp/org/ob-python.el (org-babel-prep-session:python):
* lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message)
(org-babel-scheme-execute-with-geiser, org-babel-execute:scheme):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/org-agenda.el (org-agenda-entry-types)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-time-grid, org-agenda-sorting-strategy)
(org-agenda-filter-by-category, org-agenda-forward-block):
* lisp/org/org-colview.el (org-columns--overlay-text):
* lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces):
* lisp/org/org-indent.el (org-indent-set-line-properties):
* lisp/org/org-macs.el (org-get-limited-outline-regexp):
* lisp/org/org-mobile.el (org-mobile-files):
* lisp/org/org.el (org-use-fast-todo-selection)
(org-extend-today-until, org-use-property-inheritance)
(org-refresh-effort-properties, org-open-at-point-global)
(org-track-ordered-property-with-tag, org-shiftright):
* lisp/org/ox-html.el (org-html-checkbox-type):
* lisp/org/ox-man.el (org-man-source-highlight)
(org-man-verse-block):
* lisp/org/ox-publish.el (org-publish-sitemap-default):
* lisp/outline.el (outline-head-from-level):
* lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-calc-command-indent, dcl-indent-to):
* lisp/progmodes/flymake.el (flymake-make-diagnostic)
(flymake--overlays, flymake-diagnostic-functions)
(flymake-diagnostic-types-alist, flymake--backend-state)
(flymake-is-running, flymake--collect, flymake-mode):
* lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop)
(gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer):
* lisp/progmodes/grep.el (grep-error-screen-columns):
* lisp/progmodes/gud.el (gud-prev-expr):
* lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column)
(ps-run-goto-error):
* lisp/progmodes/python.el (python-eldoc-get-doc)
(python-eldoc-function-timeout-permanent, python-eldoc-function):
* lisp/shadowfile.el (shadow-make-group):
* lisp/speedbar.el (speedbar-obj-do-check):
* lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook):
* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib):
* lisp/textmodes/reftex-index.el (reftex-index-goto-entry)
(reftex-index-kill, reftex-index-undo):
* lisp/textmodes/reftex-parse.el (reftex-context-substring):
* lisp/textmodes/reftex.el (reftex-TeX-master-file):
* lisp/textmodes/rst.el (rst-next-hdr, rst-toc)
(rst-uncomment-region, rst-font-lock-extend-region-internal):
* lisp/thumbs.el (thumbs-mode):
* lisp/vc/ediff-util.el (ediff-restore-diff):
* lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag):
* lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p):
* lisp/wid-edit.el (widget-field-value-set, string):
* lisp/x-dnd.el (x-dnd-version-from-flags)
(x-dnd-more-than-3-from-flags): Assorted docfixes.
2019-09-21 00:27:53 +02:00
|
|
|
"Return the image of a key, if any."
|
2012-12-26 22:30:58 +00:00
|
|
|
(with-temp-buffer
|
2016-02-12 14:39:30 +11:00
|
|
|
(set-buffer-multibyte nil)
|
2012-12-26 22:30:58 +00:00
|
|
|
(let* ((coding-system-for-write 'binary)
|
|
|
|
(coding-system-for-read 'binary)
|
|
|
|
(data (shell-command-to-string
|
2012-12-27 14:44:01 +00:00
|
|
|
(format "%s --list-options no-show-photos --attribute-fd 3 --list-keys %s 3>&1 >/dev/null 2>&1"
|
2013-02-25 22:47:31 +00:00
|
|
|
(shell-quote-argument epg-gpg-program) key-id))))
|
2012-12-26 22:30:58 +00:00
|
|
|
(when (> (length data) 0)
|
|
|
|
(insert (substring data 16))
|
2013-07-02 02:34:12 +00:00
|
|
|
(condition-case nil
|
|
|
|
(gnus-create-image (buffer-string) nil t)
|
|
|
|
(error))))))
|
2012-12-26 13:20:21 +09:00
|
|
|
|
2013-06-14 03:24:05 +00:00
|
|
|
(autoload 'gnus-rescale-image "gnus-util")
|
|
|
|
|
2012-12-26 13:20:21 +09:00
|
|
|
(defun mml2015-epg-key-image-to-string (key-id)
|
lisp/*.el: Fix typos and other trivial doc fixes
* lisp/allout-widgets.el (allout-widgets-auto-activation)
(allout-current-decorated-p):
* lisp/auth-source.el (auth-source-protocols):
* lisp/autorevert.el (auto-revert-set-timer):
* lisp/battery.el (battery-mode-line-limit):
* lisp/calc/calcalg3.el (math-map-binop):
* lisp/calendar/cal-dst.el (calendar-dst-find-startend):
* lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute):
* lisp/calendar/calendar.el (calendar-date-echo-text)
(calendar-generate-month, calendar-string-spread)
(calendar-cursor-to-date, calendar-read, calendar-read-date)
(calendar-mark-visible-date, calendar-dayname-on-or-before):
* lisp/calendar/diary-lib.el (diary-ordinal-suffix):
* lisp/cedet/ede/autoconf-edit.el (autoconf-new-program)
(autoconf-find-last-macro, autoconf-parameter-strip):
* lisp/cedet/ede/config.el (ede-target-with-config-build):
* lisp/cedet/ede/linux.el (ede-linux--detect-architecture)
(ede-linux--get-architecture):
* lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache)
(semantic-displayer-abstract, semantic-displayer-point-position):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic-format-tag-short-doc):
* lisp/cedet/semantic/fw.el (semantic-find-file-noselect):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time)
(semantic-idle-breadcrumbs-display-function)
(semantic-idle-breadcrumbs-format-tag-list-function):
* lisp/cedet/semantic/lex.el (semantic-lex-map-types)
(define-lex, define-lex-block-type-analyzer):
* lisp/cedet/semantic/senator.el (senator-search-default-tag-filter):
* lisp/cedet/semantic/symref.el (semantic-symref-result)
(semantic-symref-hit-to-tag-via-db):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-new-variable)
(semantic-tag-new-include, semantic-tag-new-package)
(semantic-tag-set-faux, semantic-create-tag-proxy)
(semantic-tag-function-parent)
(semantic-tag-components-with-overlays):
* lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces)
(srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary)
(srecode-dictionary-add-entries, srecode-dictionary-lookup-name)
(srecode-create-dictionaries-from-tags):
* lisp/cmuscheme.el (scheme-compile-region):
* lisp/color.el (color-lab-to-lch):
* lisp/doc-view.el (doc-view-image-width)
(doc-view-set-up-single-converter):
* lisp/dynamic-setting.el (font-setting-change-default-font)
(dynamic-setting-handle-config-changed-event):
* lisp/elec-pair.el (electric-pair-text-pairs)
(electric-pair-skip-whitespace-function)
(electric-pair-string-bound-function):
* lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance)
(avl-tree-member, avl-tree-mapcar, avl-tree-iter):
* lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree):
* lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag)
(checkdoc-spellcheck-documentation-flag, checkdoc-ispell)
(checkdoc-ispell-current-buffer, checkdoc-ispell-interactive)
(checkdoc-ispell-message-interactive)
(checkdoc-ispell-message-text, checkdoc-ispell-start)
(checkdoc-ispell-continue, checkdoc-ispell-comments)
(checkdoc-ispell-defun):
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method):
* lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group):
* lisp/emacs-lisp/lisp.el (forward-sexp, up-list):
* lisp/emacs-lisp/package-x.el (package--archive-contents-from-file):
* lisp/emacs-lisp/package.el (package-desc)
(package--make-autoloads-and-stuff, package-hidden-regexps):
* lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup):
* lisp/emacs-lisp/testcover.el (testcover-nohits)
(testcover-1value):
* lisp/epg.el (epg-receive-keys, epg-start-edit-key):
* lisp/erc/erc-backend.el (erc-server-processing-p)
(erc-split-line-length, erc-server-coding-system)
(erc-server-send, erc-message):
* lisp/erc/erc-button.el (erc-button-face, erc-button-alist)
(erc-browse-emacswiki):
* lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login):
* lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation):
* lisp/erc/erc-log.el (erc-current-logfile):
* lisp/erc/erc-match.el (erc-log-match-format)
(erc-text-matched-hook):
* lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug):
* lisp/erc/erc-networks.el (erc-server-alist)
(erc-networks-alist, erc-current-network):
* lisp/erc/erc-ring.el (erc-input-ring-index):
* lisp/erc/erc-speedbar.el (erc-speedbar)
(erc-speedbar-update-channel):
* lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag):
* lisp/erc/erc-track.el (erc-track-position-in-mode-line)
(erc-track-remove-from-mode-line, erc-modified-channels-update)
(erc-track-last-non-erc-buffer, erc-track-sort-by-importance)
(erc-track-get-active-buffer):
* lisp/erc/erc.el (erc-get-channel-user-list)
(erc-echo-notice-hook, erc-echo-notice-always-hook)
(erc-wash-quit-reason, erc-format-@nick):
* lisp/ffap.el (ffap-latex-mode):
* lisp/files.el (abort-if-file-too-large)
(dir-locals--get-sort-score, buffer-stale--default-function):
* lisp/filesets.el (filesets-tree-max-level, filesets-data)
(filesets-update-pre010505):
* lisp/gnus/gnus-agent.el (gnus-agent-flush-cache):
* lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol)
(gnus-button-prefer-mid-or-mail):
* lisp/gnus/gnus-cus.el (gnus-group-parameters):
* lisp/gnus/gnus-demon.el (gnus-demon-handlers)
(gnus-demon-run-callback):
* lisp/gnus/gnus-dired.el (gnus-dired-print):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer):
* lisp/gnus/gnus-range.el (gnus-range-normalize):
* lisp/gnus/gnus-spec.el (gnus-pad-form):
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
(gnus-server-opened, gnus-server-closed, gnus-server-denied)
(gnus-server-offline):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir)
(gnus-refer-thread-limit-to-thread)
(gnus-summary-limit-include-thread, gnus-summary-refer-thread)
(gnus-summary-find-matching):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server):
* lisp/gnus/mail-source.el (mail-source-incoming-file-prefix):
* lisp/gnus/message.el (message-cite-reply-position)
(message-cite-style-outlook, message-cite-style-thunderbird)
(message-cite-style-gmail, message--send-mail-maybe-partially):
* lisp/gnus/mm-extern.el (mm-inline-external-body):
* lisp/gnus/mm-partial.el (mm-inline-partial):
* lisp/gnus/mml-sec.el (mml-secure-message-sign)
(mml-secure-message-sign-encrypt, mml-secure-message-encrypt):
* lisp/gnus/mml2015.el (mml2015-epg-key-image)
(mml2015-epg-key-image-to-string):
* lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail):
* lisp/gnus/nnheader.el (nnheader-directory-files-is-safe):
* lisp/gnus/nnir.el (nnir-search-history)
(nnir-imap-search-other, nnir-artlist-length)
(nnir-artlist-article, nnir-artitem-group, nnir-artitem-number)
(nnir-artitem-rsv, nnir-article-group, nnir-article-number)
(nnir-article-rsv, nnir-article-ids, nnir-categorize)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-hyrex-additional-switches)
(gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms)
(nnir-read-parm, nnir-read-server-parm, nnir-search-thread):
* lisp/gnus/nnmairix.el (nnmairix-default-group)
(nnmairix-propagate-marks):
* lisp/gnus/smime.el (smime-keys, smime-crl-check)
(smime-verify-buffer, smime-noverify-buffer):
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url):
* lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header)
(spam-spamassassin-spam-status-header, spam-sa-learn-rebuild)
(spam-classifications, spam-check-stat, spam-spamassassin-score):
* lisp/help.el (describe-minor-mode-from-symbol):
* lisp/hippie-exp.el (hippie-expand-ignore-buffers):
* lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face)
(hfy-begin-span):
* lisp/ibuf-ext.el (ibuffer-update-saved-filters-format)
(ibuffer-saved-filters, ibuffer-old-saved-filters-warning)
(ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters)
(eval, ibuffer-unary-operand, file-extension, directory):
* lisp/image-dired.el (image-dired-cmd-pngcrush-options):
* lisp/image-mode.el (image-toggle-display):
* lisp/international/ccl.el (ccl-compile-read-multibyte-character)
(ccl-compile-write-multibyte-character):
* lisp/international/kkc.el (kkc-save-init-file):
* lisp/international/latin1-disp.el (latin1-display):
* lisp/international/ogonek.el (ogonek-name-encoding-alist)
(ogonek-information, ogonek-lookup-encoding)
(ogonek-deprefixify-region):
* lisp/isearch.el (isearch-filter-predicate)
(isearch--momentary-message):
* lisp/jsonrpc.el (jsonrpc-connection-send)
(jsonrpc-process-connection, jsonrpc-shutdown)
(jsonrpc--async-request-1):
* lisp/language/tibet-util.el (tibetan-char-p):
* lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date)
(feedmail-last-chance-hook, feedmail-before-fcc-hook)
(feedmail-send-it-immediately-wrapper, feedmail-find-eoh):
* lisp/mail/hashcash.el (hashcash-generate-payment)
(hashcash-generate-payment-async, hashcash-insert-payment)
(hashcash-verify-payment):
* lisp/mail/rmail.el (rmail-movemail-variant-in-use)
(rmail-get-attr-value):
* lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime):
* lisp/mail/rmailsum.el (rmail-summary-show-message):
* lisp/mail/supercite.el (sc-raw-mode-toggle):
* lisp/man.el (Man-start-calling):
* lisp/mh-e/mh-acros.el (mh-do-at-event-location)
(mh-iterate-on-messages-in-region, mh-iterate-on-range):
* lisp/mh-e/mh-alias.el (mh-alias-system-aliases)
(mh-alias-reload, mh-alias-ali)
(mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file)
(mh-alias-add-alias):
* lisp/mouse.el (mouse-save-then-kill):
* lisp/net/browse-url.el (browse-url-default-macosx-browser):
* lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value)
(eudc-variable-server-value, eudc-update-variable)
(eudc-expand-inline):
* lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
* lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list):
* lisp/net/pop3.el (pop3-list):
* lisp/net/soap-client.el (soap-namespace-put)
(soap-xs-parse-sequence, soap-parse-envelope):
* lisp/net/soap-inspect.el (soap-inspect-xs-complex-type):
* lisp/nxml/rng-xsd.el (rng-xsd-date-to-days):
* lisp/org/ob-C.el (org-babel-prep-session:C)
(org-babel-load-session:C):
* lisp/org/ob-J.el (org-babel-execute:J):
* lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* lisp/org/ob-core.el (org-babel-process-file-name):
* lisp/org/ob-ebnf.el (org-babel-execute:ebnf):
* lisp/org/ob-forth.el (org-babel-execute:forth):
* lisp/org/ob-fortran.el (org-babel-execute:fortran)
(org-babel-prep-session:fortran, org-babel-load-session:fortran):
* lisp/org/ob-groovy.el (org-babel-execute:groovy):
* lisp/org/ob-io.el (org-babel-execute:io):
* lisp/org/ob-js.el (org-babel-execute:js):
* lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond)
(org-babel-lilypond-compile-post-tangle)
(org-babel-lilypond-display-pdf-post-tangle)
(org-babel-lilypond-tangle)
(org-babel-lilypond-execute-tangled-ly)
(org-babel-lilypond-compile-lilyfile)
(org-babel-lilypond-check-for-compile-error)
(org-babel-lilypond-process-compile-error)
(org-babel-lilypond-mark-error-line)
(org-babel-lilypond-parse-error-line)
(org-babel-lilypond-attempt-to-open-pdf)
(org-babel-lilypond-attempt-to-play-midi)
(org-babel-lilypond-switch-extension)
(org-babel-lilypond-set-header-args):
* lisp/org/ob-lua.el (org-babel-prep-session:lua):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-processing.el (org-babel-prep-session:processing):
* lisp/org/ob-python.el (org-babel-prep-session:python):
* lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message)
(org-babel-scheme-execute-with-geiser, org-babel-execute:scheme):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/org-agenda.el (org-agenda-entry-types)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-time-grid, org-agenda-sorting-strategy)
(org-agenda-filter-by-category, org-agenda-forward-block):
* lisp/org/org-colview.el (org-columns--overlay-text):
* lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces):
* lisp/org/org-indent.el (org-indent-set-line-properties):
* lisp/org/org-macs.el (org-get-limited-outline-regexp):
* lisp/org/org-mobile.el (org-mobile-files):
* lisp/org/org.el (org-use-fast-todo-selection)
(org-extend-today-until, org-use-property-inheritance)
(org-refresh-effort-properties, org-open-at-point-global)
(org-track-ordered-property-with-tag, org-shiftright):
* lisp/org/ox-html.el (org-html-checkbox-type):
* lisp/org/ox-man.el (org-man-source-highlight)
(org-man-verse-block):
* lisp/org/ox-publish.el (org-publish-sitemap-default):
* lisp/outline.el (outline-head-from-level):
* lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-calc-command-indent, dcl-indent-to):
* lisp/progmodes/flymake.el (flymake-make-diagnostic)
(flymake--overlays, flymake-diagnostic-functions)
(flymake-diagnostic-types-alist, flymake--backend-state)
(flymake-is-running, flymake--collect, flymake-mode):
* lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop)
(gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer):
* lisp/progmodes/grep.el (grep-error-screen-columns):
* lisp/progmodes/gud.el (gud-prev-expr):
* lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column)
(ps-run-goto-error):
* lisp/progmodes/python.el (python-eldoc-get-doc)
(python-eldoc-function-timeout-permanent, python-eldoc-function):
* lisp/shadowfile.el (shadow-make-group):
* lisp/speedbar.el (speedbar-obj-do-check):
* lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook):
* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib):
* lisp/textmodes/reftex-index.el (reftex-index-goto-entry)
(reftex-index-kill, reftex-index-undo):
* lisp/textmodes/reftex-parse.el (reftex-context-substring):
* lisp/textmodes/reftex.el (reftex-TeX-master-file):
* lisp/textmodes/rst.el (rst-next-hdr, rst-toc)
(rst-uncomment-region, rst-font-lock-extend-region-internal):
* lisp/thumbs.el (thumbs-mode):
* lisp/vc/ediff-util.el (ediff-restore-diff):
* lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag):
* lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p):
* lisp/wid-edit.el (widget-field-value-set, string):
* lisp/x-dnd.el (x-dnd-version-from-flags)
(x-dnd-more-than-3-from-flags): Assorted docfixes.
2019-09-21 00:27:53 +02:00
|
|
|
"Return a string with the image of a key, if any."
|
2013-08-01 22:58:40 +00:00
|
|
|
(let ((key-image (mml2015-epg-key-image key-id)))
|
|
|
|
(if (not key-image)
|
|
|
|
""
|
|
|
|
(condition-case error
|
|
|
|
(let ((result " "))
|
|
|
|
(put-text-property
|
|
|
|
1 2 'display
|
|
|
|
(gnus-rescale-image key-image
|
|
|
|
(cons mml2015-maximum-key-image-dimension
|
|
|
|
mml2015-maximum-key-image-dimension))
|
|
|
|
result)
|
|
|
|
result)
|
|
|
|
(error "")))))
|
2012-12-26 13:20:21 +09:00
|
|
|
|
|
|
|
(defun mml2015-epg-signature-to-string (signature)
|
|
|
|
(concat (epg-signature-to-string signature)
|
2014-05-08 22:42:13 +00:00
|
|
|
(when mml2015-display-key-image
|
|
|
|
(mml2015-epg-key-image-to-string (epg-signature-key-id signature)))))
|
2012-12-26 13:20:21 +09:00
|
|
|
|
|
|
|
(defun mml2015-epg-verify-result-to-string (verify-result)
|
|
|
|
(mapconcat #'mml2015-epg-signature-to-string verify-result "\n"))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun mml2015-epg-decrypt (handle ctl)
|
|
|
|
(catch 'error
|
|
|
|
(let ((inhibit-redisplay t)
|
|
|
|
context plain child handles result decrypt-status)
|
|
|
|
(unless (setq child (mm-find-part-by-type
|
|
|
|
(cdr handle)
|
|
|
|
"application/octet-stream" nil t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2007-10-28 09:18:39 +00:00
|
|
|
(throw 'error handle))
|
|
|
|
(setq context (epg-make-context))
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(if (or mml2015-cache-passphrase mml-secure-cache-passphrase)
|
2007-10-28 09:18:39 +00:00
|
|
|
(epg-context-set-passphrase-callback
|
|
|
|
context
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(cons 'mml-secure-passphrase-callback 'OpenPGP)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(condition-case error
|
|
|
|
(setq plain (epg-decrypt-string context (mm-get-part child))
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
mml-secure-secret-key-id-list nil)
|
2007-10-28 09:18:39 +00:00
|
|
|
(error
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(mml-secure-clear-secret-key-id-list)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (eq (car error) 'quit)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-details "Quit.")
|
|
|
|
(mm-sec-status 'gnus-details (mml2015-format-error error)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(throw 'error handle)))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert plain)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
(replace-match "\n" t t))
|
|
|
|
(setq handles (mm-dissect-buffer t))
|
|
|
|
(mm-destroy-parts handle)
|
|
|
|
(if (epg-context-result-for context 'verify)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-info
|
2007-10-28 09:18:39 +00:00
|
|
|
(concat "OK\n"
|
2012-12-26 13:20:21 +09:00
|
|
|
(mml2015-epg-verify-result-to-string
|
2007-10-28 09:18:39 +00:00
|
|
|
(epg-context-result-for context 'verify))))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK"))
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (stringp (car handles))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-details
|
2007-10-28 09:18:39 +00:00
|
|
|
(mm-handle-multipart-ctl-parameter handles 'gnus-details))))
|
|
|
|
(if (listp (car handles))
|
|
|
|
handles
|
|
|
|
(list handles)))))
|
|
|
|
|
|
|
|
(defun mml2015-epg-clear-decrypt ()
|
|
|
|
(let ((inhibit-redisplay t)
|
|
|
|
(context (epg-make-context))
|
|
|
|
plain)
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(if (or mml2015-cache-passphrase mml-secure-cache-passphrase)
|
2007-10-28 09:18:39 +00:00
|
|
|
(epg-context-set-passphrase-callback
|
|
|
|
context
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(cons 'mml-secure-passphrase-callback 'OpenPGP)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(condition-case error
|
|
|
|
(setq plain (epg-decrypt-string context (buffer-string))
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
mml-secure-secret-key-id-list nil)
|
2007-10-28 09:18:39 +00:00
|
|
|
(error
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(mml-secure-clear-secret-key-id-list)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (eq (car error) 'quit)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-details "Quit.")
|
|
|
|
(mm-sec-status 'gnus-details (mml2015-format-error error)))))
|
2007-10-28 09:18:39 +00:00
|
|
|
(when plain
|
|
|
|
(erase-buffer)
|
|
|
|
;; Treat data which epg returns as a unibyte string.
|
|
|
|
(mm-disable-multibyte)
|
|
|
|
(insert plain)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (search-forward "\r\n" nil t)
|
|
|
|
(replace-match "\n" t t))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info "OK")
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (epg-context-result-for context 'verify)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-details
|
2012-12-26 13:20:21 +09:00
|
|
|
(mml2015-epg-verify-result-to-string
|
2007-10-28 09:18:39 +00:00
|
|
|
(epg-context-result-for context 'verify)))))))
|
|
|
|
|
|
|
|
(defun mml2015-epg-verify (handle ctl)
|
|
|
|
(catch 'error
|
|
|
|
(let ((inhibit-redisplay t)
|
|
|
|
context plain signature-file part signature)
|
|
|
|
(when (or (null (setq part (mm-find-raw-part-by-type
|
|
|
|
ctl (or (mm-handle-multipart-ctl-parameter
|
|
|
|
ctl 'protocol)
|
|
|
|
"application/pgp-signature")
|
|
|
|
t)))
|
|
|
|
(null (setq signature (mm-find-part-by-type
|
|
|
|
(cdr handle) "application/pgp-signature"
|
|
|
|
nil t))))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
2007-10-28 09:18:39 +00:00
|
|
|
(throw 'error handle))
|
2016-02-13 14:31:53 +11:00
|
|
|
(setq part (replace-regexp-in-string "\n" "\r\n" part)
|
2007-10-28 09:18:39 +00:00
|
|
|
signature (mm-get-part signature)
|
|
|
|
context (epg-make-context))
|
|
|
|
(condition-case error
|
|
|
|
(setq plain (epg-verify-string context signature part))
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (eq (car error) 'quit)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-details "Quit.")
|
|
|
|
(mm-sec-status 'gnus-details (mml2015-format-error error)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(throw 'error handle)))
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-info
|
2012-12-26 13:20:21 +09:00
|
|
|
(mml2015-epg-verify-result-to-string
|
|
|
|
(epg-context-result-for context 'verify)))
|
2007-10-28 09:18:39 +00:00
|
|
|
handle)))
|
|
|
|
|
|
|
|
(defun mml2015-epg-clear-verify ()
|
|
|
|
(let ((inhibit-redisplay t)
|
|
|
|
(context (epg-make-context))
|
2016-02-12 14:39:30 +11:00
|
|
|
(signature (encode-coding-string (buffer-string)
|
|
|
|
coding-system-for-write))
|
2007-10-28 09:18:39 +00:00
|
|
|
plain)
|
|
|
|
(condition-case error
|
|
|
|
(setq plain (epg-verify-string context signature))
|
|
|
|
(error
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-error 'gnus-info "Failed")
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (eq (car error) 'quit)
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status 'gnus-details "Quit.")
|
|
|
|
(mm-sec-status 'gnus-details (mml2015-format-error error)))))
|
2007-10-28 09:18:39 +00:00
|
|
|
(if plain
|
|
|
|
(progn
|
2019-09-30 08:41:43 +02:00
|
|
|
(mm-sec-status
|
|
|
|
'gnus-info
|
2012-12-26 13:20:21 +09:00
|
|
|
(mml2015-epg-verify-result-to-string
|
2007-10-28 09:18:39 +00:00
|
|
|
(epg-context-result-for context 'verify)))
|
|
|
|
(delete-region (point-min) (point-max))
|
2016-02-12 14:39:30 +11:00
|
|
|
(insert (decode-coding-string plain coding-system-for-read)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(mml2015-extract-cleartext-signature))))
|
|
|
|
|
|
|
|
(defun mml2015-epg-sign (cont)
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(let ((inhibit-redisplay t)
|
|
|
|
(boundary (mml-compute-boundary cont)))
|
2013-05-22 13:18:40 +00:00
|
|
|
;; Signed data must end with a newline (RFC 3156, 5).
|
|
|
|
(goto-char (point-max))
|
|
|
|
(unless (bolp)
|
|
|
|
(insert "\n"))
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(let* ((pair (mml-secure-epg-sign 'OpenPGP t))
|
|
|
|
(signature (car pair))
|
|
|
|
(micalg (cdr pair)))
|
2018-04-14 17:18:53 +02:00
|
|
|
(unless (stringp signature)
|
|
|
|
(error "Signature failed"))
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
|
|
|
|
boundary))
|
|
|
|
(if micalg
|
|
|
|
(insert (format "\tmicalg=pgp-%s; "
|
|
|
|
(downcase
|
|
|
|
(cdr (assq micalg
|
|
|
|
epg-digest-algorithm-alist))))))
|
|
|
|
(insert "protocol=\"application/pgp-signature\"\n")
|
|
|
|
(insert (format "\n--%s\n" boundary))
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "\n--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/pgp-signature; name=\"signature.asc\"\n\n")
|
|
|
|
(insert signature)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "--%s--\n" boundary))
|
|
|
|
(goto-char (point-max)))))
|
2007-10-28 09:18:39 +00:00
|
|
|
|
|
|
|
(defun mml2015-epg-encrypt (cont &optional sign)
|
2011-01-28 01:34:09 +00:00
|
|
|
(let* ((inhibit-redisplay t)
|
|
|
|
(boundary (mml-compute-boundary cont))
|
Refactor mml-smime.el, mml1991.el, mml2015.el
(Maybe this is the last merge from Gnus git to Emacs git)
Cf. discussion on ding mailing list, messages in
<http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
Common code from the three files mml-smime.el, mml1991.el, and
mml2015.el is moved to mml-sec.el. Auxiliary functions are added
to gnus-util.el.
The code is supported by test cases with necessary test keys.
Documentation in message.texi is updated.
* doc/misc/message.texi (Security, Using S/MIME):
Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
New functions.
* lisp/gnus/mml-sec.el: Require gnus-util and epg.
(epa--select-keys): Autoload.
(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
(mml-secure-openpgp-signers): New user option;
make mml1991-signers and mml2015-signers obsolete aliases to it.
(mml-secure-smime-signers): New user option;
make mml-smime-signers an obsolete alias to it.
(mml-secure-openpgp-encrypt-to-self): New user option;
make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
aliases to it.
(mml-secure-smime-encrypt-to-self): New user option;
make mml-smime-encrypt-to-self an obsolete alias to it.
(mml-secure-openpgp-sign-with-sender): New user option;
make mml2015-sign-with-sender an obsolete alias to it.
(mml-secure-smime-sign-with-sender): New user option;
make mml-smime-sign-with-sender an obsolete alias to it.
(mml-secure-openpgp-always-trust): New user option;
make mml2015-always-trust an obsolete alias to it.
(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
New user options.
(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
(mml-secure-passphrase-callback, mml-secure-check-user-id)
(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
(mml-secure-fingerprint, mml-secure-filter-keys)
(mml-secure-normalize-cust-name, mml-secure-select-keys)
(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
(mml-secure-self-recipients, mml-secure-recipients)
(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
* lisp/gnus/mml-smime.el: Require epg;
refactor declaration and autoloading of epg functions.
(mml-smime-use): Doc fix.
(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
Obsolete.
(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
Use format instead of gnus-format-message.
(mml-smime-epg-secret-key-id-list): Remove variable.
(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
(mml-smime-epg-find-usable-secret-key): Remove functions.
(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
(mml1991-passphrase-cache-expiry): Obsolete.
(mml1991-epg-secret-key-id-list): Remove variable.
(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
(mml1991-epg-find-usable-secret-key): Remove functions.
(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
(mml2015-passphrase-cache-expiry): Obsolete.
(mml2015-epg-secret-key-id-list): Remove variable.
(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
(mml2015-epg-find-usable-secret-key): Remove functions.
(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
(mml2015-epg-encrypt): Refactor.
2016-01-03 01:10:34 +00:00
|
|
|
(cipher (mml-secure-epg-encrypt 'OpenPGP cont sign)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(delete-region (point-min) (point-max))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n"
|
|
|
|
boundary))
|
|
|
|
(insert "\tprotocol=\"application/pgp-encrypted\"\n\n")
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/pgp-encrypted\n\n")
|
|
|
|
(insert "Version: 1\n\n")
|
|
|
|
(insert (format "--%s\n" boundary))
|
|
|
|
(insert "Content-Type: application/octet-stream\n\n")
|
|
|
|
(insert cipher)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert (format "--%s--\n" boundary))
|
|
|
|
(goto-char (point-max))))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; General wrapper
|
|
|
|
|
2007-12-11 05:26:52 +00:00
|
|
|
(autoload 'gnus-buffer-live-p "gnus-util")
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun mml2015-clean-buffer ()
|
|
|
|
(if (gnus-buffer-live-p mml2015-result-buffer)
|
|
|
|
(with-current-buffer mml2015-result-buffer
|
|
|
|
(erase-buffer)
|
|
|
|
t)
|
|
|
|
(setq mml2015-result-buffer
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-get-buffer-create " *MML2015 Result*"))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
|
|
|
|
|
|
|
(defsubst mml2015-clear-decrypt-function ()
|
|
|
|
(nth 6 (assq mml2015-use mml2015-function-alist)))
|
|
|
|
|
|
|
|
(defsubst mml2015-clear-verify-function ()
|
|
|
|
(nth 5 (assq mml2015-use mml2015-function-alist)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-decrypt (handle ctl)
|
|
|
|
(mml2015-clean-buffer)
|
|
|
|
(let ((func (nth 4 (assq mml2015-use mml2015-function-alist))))
|
|
|
|
(if func
|
|
|
|
(funcall func handle ctl)
|
|
|
|
handle)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-decrypt-test (handle ctl)
|
|
|
|
mml2015-use)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-verify (handle ctl)
|
|
|
|
(mml2015-clean-buffer)
|
|
|
|
(let ((func (nth 3 (assq mml2015-use mml2015-function-alist))))
|
|
|
|
(if func
|
|
|
|
(funcall func handle ctl)
|
|
|
|
handle)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-verify-test (handle ctl)
|
|
|
|
mml2015-use)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-encrypt (cont &optional sign)
|
|
|
|
(mml2015-clean-buffer)
|
|
|
|
(let ((func (nth 2 (assq mml2015-use mml2015-function-alist))))
|
|
|
|
(if func
|
|
|
|
(funcall func cont sign)
|
|
|
|
(error "Cannot find encrypt function"))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-sign (cont)
|
|
|
|
(mml2015-clean-buffer)
|
|
|
|
(let ((func (nth 1 (assq mml2015-use mml2015-function-alist))))
|
|
|
|
(if func
|
|
|
|
(funcall func cont)
|
|
|
|
(error "Cannot find sign function"))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun mml2015-self-encrypt ()
|
|
|
|
(mml2015-encrypt nil))
|
|
|
|
|
|
|
|
(provide 'mml2015)
|
|
|
|
|
|
|
|
;;; mml2015.el ends here
|