mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-09 07:40:39 -08:00
* lisp/gnus/gnus-group.el (features): Use `dlet`. (gnus-tmp-level, gnus-tmp-marked, gnus-tmp-group): Declare vars. (gnus-group-insert-group-line): Bind dynbound vars via `let` rather than as formal args. Bind `number` as dynbound. (gnus-visual, gnus-score-find-score-files-function) (gnus-home-score-file, gnus-apply-kill-hook) (gnus-summary-expunge-below): Declare vars. (gnus-group-restart, gnus-group-list-plus): Fix `interactive` spec since the arg is unused. * lisp/gnus/mail-source.el (mail-source-bind, mail-source-bind-common): Use `dlet` and suppress the warnings about the non-prefixed dynbound vars. (mail-source-set-1): Remove unused var `auth-info`. (mail-source-call-script): Remove unused var `background`. (mail-source-fetch-pop, mail-source-check-pop): Bind pop3 vars with `dlet`. * lisp/gnus/gnus-int.el (mail-source-plugged, gnus-inhibit-demon): Declare vars. (gnus-server-opened, gnus-status-message) (gnus-open-server, gnus-close-server, gnus-request-list) (gnus-finish-retrieve-group-infos, gnus-retrieve-group-data-early) (gnus-request-list-newsgroups, gnus-request-newgroups) (gnus-request-regenerate, gnus-request-compact, gnus-request-group) (gnus-retrieve-groups, gnus-request-post, gnus-request-expunge-group) (gnus-request-scan, gnus-request-update-info, gnus-request-marks) (gnus-request-accept-article, gnus-request-create-group) (gnus-asynchronous-p, gnus-remove-denial): Bind `gnus-command-method` via `let` rather than as formal args. * lisp/gnus/gnus-topic.el (gnus-topic-insert-topic-line): Pass documented vars to eval for `gnus-topic-line-format-spec`. * lisp/gnus/message.el (message-yank-original): Use `cl-progv` rather than `eval` to bind the vars from `message-cite-style`. * lisp/gnus/mml.el (mml-parse-1): Use `apply` instead of `eval`. (gnus-newsgroup-name, gnus-displaying-mime, gnus-newsgroup-name) (gnus-article-prepare-hook, gnus-newsgroup-charset) (gnus-original-article-buffer, gnus-message-buffer) (message-this-is-news, message-this-is-mail): Declare vars. * lisp/gnus/deuglify.el (gnus-outlook-rearrange-article): Remove unused var `cite-marks`. * lisp/gnus/gnus-art.el (ansi-color-context-region): Declare var. (gnus-mime-display-attachment-buttons-in-header): Move declaration before first use. (gnus-mime-display-alternative): Remove unused var `from`. * lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-list): Remove unused var `start` `end`. * lisp/gnus/gnus-cache.el (gnus-article-decode-hook) (nnml-generate-active-function): Declare var. * lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Remove unused var `keywords`. * lisp/gnus/gnus-cloud.el (gnus-cloud-encode-data): Remove unused var `cipher`. (gnus-cloud-ensure-cloud-group): Remove unused var `method`. * lisp/gnus/gnus-delay.el (gnus-delay-article): Remove unused var `days`. * lisp/gnus/gnus-html.el (gnus-html-wash-images): Remove unused vars `tag`, `string`, and `images`. (gnus-html-wash-tags): Remove unused vars `string` and `images`. * lisp/gnus/gnus-msg.el (gnus-msg-mail): Remove unused var `group-name`. (gnus-group-mail, gnus-group-news, gnus-summary-mail-other-window) (gnus-summary-news-other-window): Remove unused vars `group` and `buffer`. (gnus-configure-posting-styles): Remove unused vars `style` and `attribute`. * lisp/gnus/gnus-picon.el (gnus-picon-find-face): Remove unused vars `database`, `directory`, and `instance`. (gnus-picon-transform-newsgroups): Remove unused var `point`. * lisp/gnus/gnus-range.el (gnus-range-difference): Remove unused var `safe`. * lisp/gnus/gnus-score.el (gnus-score-load-file): Remove unused var `score-fn`. * lisp/gnus/gnus-sum.el (message-options-set-recipient): Declare var. * lisp/gnus/gnus-undo.el (gnus-undo): Fix docstring lie. * lisp/gnus/gnus-util.el (print-string-length) (iswitchb-make-buflist-hook): Declare vars. (gnus-emacs-version): Remove unused var `codename`. (gnus-rename-file): Remove unused vars `old-name` and `new-name`. * lisp/gnus/gnus-uu.el (gnus-uu-yenc-article): Remove unused var `start-char`. (gnus-asynchronous): Declare var. * lisp/gnus/mm-partial.el (gnus-displaying-mime): Declare var. (mm-inline-partial): Remove unused var `buffer`. * lisp/gnus/mm-view.el (w3m-force-redisplay, w3m-safe-url-regexp) (gnus-displaying-mime, gnus-original-article-buffer) (gnus-article-prepare-hook): Declare vars. * lisp/gnus/mml-smime.el (mml-smime-epg-encrypt): Remove unused var `boundary`. (mml-smime-epg-verify): Remove unused vars `plain` and `signature-file`. * lisp/gnus/mml1991.el (pgg-text-mode): Declare var. * lisp/gnus/mml2015.el (pgg-text-mode): Declare var. (mml2015-pgg-decrypt): Remove unused var `result`. (mml2015-epg-key-image-to-string): Remove unused var `error`. (mml2015-epg-decrypt): Remove unused var `result`. (mml2015-epg-verify): Remove unused vars `plain` and `signature-file`. * lisp/gnus/nnbabyl.el (nnml-current-directory): Declare var. * lisp/gnus/nndiary.el (nndiary-files): Move declaration before first use. * lisp/gnus/nnfolder.el (nnfolder-request-accept-article): Remove unused var `buf`. * lisp/gnus/nnmail.el (nnmail-parse-active): Remove unused var `err`. * lisp/gnus/nnmairix.el (nnmairix-request-group): Remove unused var `args`. (nnmairix-request-create-group): Remove unused var `info`. (nnmairix-request-list): Remove unused var `folder`. (nnmairix-request-set-mark): Remove unused var `propto`. (nnmairix-request-set-mark): Remove unused vars `number` and `method`. (nnmairix-close-group): Remove unused var `method`. (nnmairix-create-search-group-from-message): Remove unused var `cq`. (nnmairix-create-server-and-default-group): Remove unused var `create`. (nnmairix-purge-old-groups): Remove unused var `folder`. (nnmairix-remove-tick-mark-original-article, nnmairix-get-valid-servers): Remove unused var `cur`. (nnmairix-replace-group-and-numbers): Remove unused var `header`. (nnmairix-goto-original-article): Remove unused var `rval`. (nnmairix-widget-create-query): Remove unused var `allwidgets`. * lisp/gnus/nnmbox.el (nnml-current-directory): Declare var. * lisp/gnus/nnmh.el (nnmh-toplev): Move declaration before first use. (nnmh-request-list-1): Remove unused var `rdir`. * lisp/gnus/nnml.el (nnml-generate-nov-file): Remove unused var `file`. * lisp/gnus/nnrss.el (nnrss-request-article): Remove unused var `post`. (nnrss-request-article): Remove unused var `fn`. (nnrss-check-group): Remove unused var `rdf-ns`. * lisp/gnus/nnweb.el (nnweb-request-article): Remove unused var `active`. (nnweb-google-parse-1): Remove unused var `Score`. * lisp/gnus/spam-stat.el (spam-stat-error-holder): Remove var. (spam-stat-buffer-words-with-scores): Remove unused var `word`. (spam-stat-score-buffer): Remove unused var `spam-stat-error-holder`. (spam-stat-split-fancy): Use `err` instead of `spam-stat-error-holder`. * lisp/gnus/spam-wash.el (spam-wash): Remove unused var `handle`. * lisp/gnus/spam.el (spam-copy-or-move-routine): Remove unused vars `article` and `mark`. (spam-register-routine): Remove unused var `article`. (spam-log-undo-registration): Remove unused var `found`. (spam-ifile-register-with-ifile): Remove unused var `parameters`. (spam-check-stat): Remove unused vars `category` and `return`. (spam-parse-list): Remove unused var `found`. (spam-filelist-register-routine): Remove unused var `from`.
428 lines
14 KiB
EmacsLisp
428 lines
14 KiB
EmacsLisp
;;; mml-smime.el --- S/MIME support for MML -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2000-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Simon Josefsson <simon@josefsson.org>
|
|
;; Keywords: Gnus, MIME, S/MIME, MML
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; 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.
|
|
|
|
;; 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.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
|
|
|
(require 'smime)
|
|
(require 'mm-decode)
|
|
(require 'mml-sec)
|
|
(autoload 'message-narrow-to-headers "message")
|
|
(autoload 'message-fetch-field "message")
|
|
|
|
;; Prefer epg over openssl as epg uses GnuPG's gpgsm,
|
|
;; which features full-fledged certificate management, while openssl requires
|
|
;; major manual efforts for certificate revocation and expiry and has bugs
|
|
;; as documented under man smime(1).
|
|
(require 'epg)
|
|
|
|
(defcustom mml-smime-use 'epg
|
|
"Whether to use OpenSSL or EasyPG (EPG) to handle S/MIME messages.
|
|
If you're thinking about using OpenSSL, please first read the BUGS section
|
|
in the manual for the `smime' command that comes with OpenSSL.
|
|
We recommend EasyPG."
|
|
:group 'mime-security
|
|
:type '(choice (const :tag "EPG" epg)
|
|
(const :tag "OpenSSL" openssl)))
|
|
|
|
(defvar mml-smime-function-alist
|
|
'((openssl mml-smime-openssl-sign
|
|
mml-smime-openssl-encrypt
|
|
mml-smime-openssl-sign-query
|
|
mml-smime-openssl-encrypt-query
|
|
mml-smime-openssl-verify
|
|
mml-smime-openssl-verify-test)
|
|
(epg mml-smime-epg-sign
|
|
mml-smime-epg-encrypt
|
|
nil
|
|
nil
|
|
mml-smime-epg-verify
|
|
mml-smime-epg-verify-test)))
|
|
|
|
(defcustom mml-smime-cache-passphrase mml-secure-cache-passphrase
|
|
"If t, cache passphrase."
|
|
:group 'mime-security
|
|
:type 'boolean)
|
|
(make-obsolete-variable 'mml-smime-cache-passphrase
|
|
'mml-secure-cache-passphrase
|
|
"25.1")
|
|
|
|
(defcustom mml-smime-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
|
|
`mml-smime-cache-passphrase'."
|
|
:group 'mime-security
|
|
:type 'integer)
|
|
(make-obsolete-variable 'mml-smime-passphrase-cache-expiry
|
|
'mml-secure-passphrase-cache-expiry
|
|
"25.1")
|
|
|
|
(defcustom mml-smime-signers nil
|
|
"A list of your own key ID which will be used to sign a message."
|
|
:group 'mime-security
|
|
:type '(repeat (string :tag "Key ID")))
|
|
|
|
(defcustom mml-smime-sign-with-sender nil
|
|
"If t, use message sender so find a key to sign with."
|
|
:group 'mime-security
|
|
:version "24.4"
|
|
:type 'boolean)
|
|
|
|
(defcustom mml-smime-encrypt-to-self nil
|
|
"If t, add your own key ID to recipient list when encryption."
|
|
:group 'mime-security
|
|
:version "24.4"
|
|
:type 'boolean)
|
|
|
|
(defun mml-smime-sign (cont)
|
|
(let ((func (nth 1 (assq mml-smime-use mml-smime-function-alist))))
|
|
(if func
|
|
(funcall func cont)
|
|
(error "Cannot find sign function"))))
|
|
|
|
(defun mml-smime-encrypt (cont)
|
|
(let ((func (nth 2 (assq mml-smime-use mml-smime-function-alist))))
|
|
(if func
|
|
(funcall func cont)
|
|
(error "Cannot find encrypt function"))))
|
|
|
|
(defun mml-smime-sign-query ()
|
|
(let ((func (nth 3 (assq mml-smime-use mml-smime-function-alist))))
|
|
(if func
|
|
(funcall func))))
|
|
|
|
(defun mml-smime-encrypt-query ()
|
|
(let ((func (nth 4 (assq mml-smime-use mml-smime-function-alist))))
|
|
(if func
|
|
(funcall func))))
|
|
|
|
(defun mml-smime-verify (handle ctl)
|
|
(let ((func (nth 5 (assq mml-smime-use mml-smime-function-alist))))
|
|
(if func
|
|
(funcall func handle ctl)
|
|
handle)))
|
|
|
|
(defun mml-smime-verify-test (handle ctl)
|
|
(let ((func (nth 6 (assq mml-smime-use mml-smime-function-alist))))
|
|
(if func
|
|
(funcall func handle ctl))))
|
|
|
|
(defun mml-smime-openssl-sign (_cont)
|
|
(when (null smime-keys)
|
|
(customize-variable 'smime-keys)
|
|
(error "No S/MIME keys configured, use customize to add your key"))
|
|
(smime-sign-buffer (cdar smime-keys))
|
|
(goto-char (point-min))
|
|
(while (search-forward "\r\n" nil t)
|
|
(replace-match "\n" t t))
|
|
(goto-char (point-max)))
|
|
|
|
(defun mml-smime-openssl-encrypt (cont)
|
|
(let (certnames certfiles tmp file tmpfiles)
|
|
;; xxx tmp files are always an security issue
|
|
(while (setq tmp (pop cont))
|
|
(if (and (consp tmp) (eq (car tmp) 'certfile))
|
|
(push (cdr tmp) certnames)))
|
|
(while (setq tmp (pop certnames))
|
|
(if (not (and (not (file-exists-p tmp))
|
|
(get-buffer tmp)))
|
|
(push tmp certfiles)
|
|
(setq file (make-temp-file (expand-file-name "mml." mm-tmp-directory)))
|
|
(with-current-buffer tmp
|
|
(write-region (point-min) (point-max) file))
|
|
(push file certfiles)
|
|
(push file tmpfiles)))
|
|
(smime-encrypt-buffer certfiles)
|
|
(while (setq tmp (pop tmpfiles))
|
|
(delete-file tmp)))
|
|
(goto-char (point-max)))
|
|
|
|
(defvar gnus-extract-address-components)
|
|
|
|
(defun mml-smime-openssl-sign-query ()
|
|
;; query information (what certificate) from user when MML tag is
|
|
;; added, for use later by the signing process
|
|
(when (null smime-keys)
|
|
(customize-variable 'smime-keys)
|
|
(error "No S/MIME keys configured, use customize to add your key"))
|
|
(list 'keyfile
|
|
(if (= (length smime-keys) 1)
|
|
(cadar smime-keys)
|
|
(or (let ((from (cadr (mail-extract-address-components
|
|
(or (save-excursion
|
|
(save-restriction
|
|
(message-narrow-to-headers)
|
|
(message-fetch-field "from")))
|
|
"")))))
|
|
(and from (smime-get-key-by-email from)))
|
|
(smime-get-key-by-email
|
|
(gnus-completing-read "Sign this part with what signature"
|
|
(mapcar #'car smime-keys) nil nil nil
|
|
(and (listp (car-safe smime-keys))
|
|
(caar smime-keys))))))))
|
|
|
|
(defun mml-smime-get-file-cert ()
|
|
(ignore-errors
|
|
(list 'certfile (read-file-name
|
|
"File with recipient's S/MIME certificate: "
|
|
smime-certificate-directory nil t ""))))
|
|
|
|
(defun mml-smime-get-dns-cert ()
|
|
;; todo: deal with comma separated multiple recipients
|
|
(let (result who bad cert)
|
|
(condition-case ()
|
|
(while (not result)
|
|
(setq who (read-from-minibuffer
|
|
(format "%sLookup certificate for: " (or bad ""))
|
|
(cadr (mail-extract-address-components
|
|
(or (save-excursion
|
|
(save-restriction
|
|
(message-narrow-to-headers)
|
|
(message-fetch-field "to")))
|
|
"")))))
|
|
(if (setq cert (smime-cert-by-dns who))
|
|
(setq result (list 'certfile (buffer-name cert)))
|
|
(setq bad (format-message "`%s' not found. " who))))
|
|
(quit))
|
|
result))
|
|
|
|
(defun mml-smime-get-ldap-cert ()
|
|
;; todo: deal with comma separated multiple recipients
|
|
(let (result who bad cert)
|
|
(condition-case ()
|
|
(while (not result)
|
|
(setq who (read-from-minibuffer
|
|
(format "%sLookup certificate for: " (or bad ""))
|
|
(cadr (funcall gnus-extract-address-components
|
|
(or (save-excursion
|
|
(save-restriction
|
|
(message-narrow-to-headers)
|
|
(message-fetch-field "to")))
|
|
"")))))
|
|
(if (setq cert (smime-cert-by-ldap who))
|
|
(setq result (list 'certfile (buffer-name cert)))
|
|
(setq bad (format-message "`%s' not found. " who))))
|
|
(quit))
|
|
result))
|
|
|
|
(autoload 'gnus-completing-read "gnus-util")
|
|
|
|
(defun mml-smime-openssl-encrypt-query ()
|
|
;; todo: try dns/ldap automatically first, before prompting user
|
|
(let (certs done)
|
|
(while (not done)
|
|
(cl-ecase (read (gnus-completing-read
|
|
"Fetch certificate from"
|
|
'("dns" "ldap" "file") t nil nil
|
|
"ldap"))
|
|
(dns (setq certs (append certs
|
|
(mml-smime-get-dns-cert))))
|
|
(ldap (setq certs (append certs
|
|
(mml-smime-get-ldap-cert))))
|
|
(file (setq certs (append certs
|
|
(mml-smime-get-file-cert)))))
|
|
(setq done (not (y-or-n-p "Add more recipients? "))))
|
|
certs))
|
|
|
|
(defun mml-smime-openssl-verify (handle ctl)
|
|
(with-temp-buffer
|
|
(insert-buffer-substring (mm-handle-multipart-original-buffer ctl))
|
|
(goto-char (point-min))
|
|
(insert (format "Content-Type: %s; " (mm-handle-media-type ctl)))
|
|
(insert (format "protocol=\"%s\"; "
|
|
(mm-handle-multipart-ctl-parameter ctl 'protocol)))
|
|
(insert (format "micalg=\"%s\"; "
|
|
(mm-handle-multipart-ctl-parameter ctl 'micalg)))
|
|
(insert (format "boundary=\"%s\"\n\n"
|
|
(mm-handle-multipart-ctl-parameter ctl 'boundary)))
|
|
(when (get-buffer smime-details-buffer)
|
|
(kill-buffer smime-details-buffer))
|
|
(let ((buf (current-buffer))
|
|
(good-signature (smime-noverify-buffer))
|
|
(good-certificate (and (or smime-CA-file smime-CA-directory)
|
|
(smime-verify-buffer)))
|
|
addresses openssl-output)
|
|
(setq openssl-output (with-current-buffer smime-details-buffer
|
|
(buffer-string)))
|
|
(if (not good-signature)
|
|
(progn
|
|
;; we couldn't verify message, fail with openssl output as message
|
|
(mm-sec-error
|
|
'gnus-info "Failed"
|
|
'gnus-details
|
|
(concat "OpenSSL failed to verify message integrity:\n"
|
|
"-------------------------------------------\n"
|
|
openssl-output)))
|
|
;; verify mail addresses in mail against those in certificate
|
|
(when (and (smime-pkcs7-region (point-min) (point-max))
|
|
(smime-pkcs7-certificates-region (point-min) (point-max)))
|
|
(with-temp-buffer
|
|
(insert-buffer-substring buf)
|
|
(goto-char (point-min))
|
|
(while (re-search-forward "-----END CERTIFICATE-----" nil t)
|
|
(when (smime-pkcs7-email-region (point-min) (point))
|
|
(setq addresses (append (smime-buffer-as-string-region
|
|
(point-min) (point))
|
|
addresses)))
|
|
(delete-region (point-min) (point)))
|
|
(setq addresses (mapcar #'downcase addresses))))
|
|
(if (not (member (downcase (or (mm-handle-multipart-from ctl) ""))
|
|
addresses))
|
|
(mm-sec-error 'gnus-info "Sender address forged")
|
|
(if good-certificate
|
|
(mm-sec-status 'gnus-info "Ok (sender authenticated)")
|
|
(mm-sec-status 'gnus-info "Ok (sender not trusted)")))
|
|
(mm-sec-status
|
|
'gnus-details
|
|
(concat "Sender claimed to be: " (mm-handle-multipart-from ctl) "\n"
|
|
(if addresses
|
|
(concat "Addresses in certificate: "
|
|
(mapconcat #'identity addresses ", "))
|
|
"No addresses found in certificate. (Requires OpenSSL 0.9.6 or later.)")
|
|
"\n" "\n"
|
|
"OpenSSL output:\n"
|
|
"---------------\n" openssl-output "\n"
|
|
"Certificate(s) inside S/MIME signature:\n"
|
|
"---------------------------------------\n"
|
|
(buffer-string) "\n")))))
|
|
handle)
|
|
|
|
(defun mml-smime-openssl-verify-test (_handle _ctl)
|
|
smime-openssl-program)
|
|
|
|
(defvar epg-user-id-alist)
|
|
(defvar epg-digest-algorithm-alist)
|
|
(defvar inhibit-redisplay)
|
|
(defvar password-cache-expiry)
|
|
|
|
(eval-when-compile
|
|
(autoload 'epg-make-context "epg")
|
|
(autoload 'epg-context-set-armor "epg")
|
|
(autoload 'epg-context-set-signers "epg")
|
|
(autoload 'epg-context-result-for "epg")
|
|
(autoload 'epg-new-signature-digest-algorithm "epg")
|
|
(autoload 'epg-verify-result-to-string "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-sub-key-fingerprint "epg")
|
|
(autoload 'epg-configuration "epg-config")
|
|
(autoload 'epg-expand-group "epg-config")
|
|
(autoload 'epa-select-keys "epa"))
|
|
|
|
(declare-function epg-key-sub-key-list "epg" (key) t)
|
|
(declare-function epg-sub-key-capability "epg" (sub-key) t)
|
|
(declare-function epg-sub-key-validity "epg" (sub-key) t)
|
|
|
|
(autoload 'mml-compute-boundary "mml")
|
|
|
|
(defun mml-smime-epg-sign (cont)
|
|
(let ((boundary (mml-compute-boundary cont)))
|
|
(goto-char (point-min))
|
|
(let* ((pair (mml-secure-epg-sign 'CMS cont))
|
|
(signature (car pair))
|
|
(micalg (cdr pair)))
|
|
(insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
|
|
boundary))
|
|
(if micalg
|
|
(insert (format "\tmicalg=%s; "
|
|
(downcase
|
|
(cdr (assq micalg
|
|
epg-digest-algorithm-alist))))))
|
|
(insert " protocol=\"application/pkcs7-signature\"\n")
|
|
(insert (format "\n--%s\n" boundary))
|
|
(goto-char (point-max))
|
|
(insert (format "\n--%s\n" boundary))
|
|
(insert "Content-Type: application/pkcs7-signature; name=smime.p7s
|
|
Content-Transfer-Encoding: base64
|
|
Content-Disposition: attachment; filename=smime.p7s
|
|
|
|
")
|
|
(insert (base64-encode-string signature) "\n")
|
|
(goto-char (point-max))
|
|
(insert (format "--%s--\n" boundary))
|
|
(goto-char (point-max)))))
|
|
|
|
(defun mml-smime-epg-encrypt (cont)
|
|
(let* ((inhibit-redisplay t) ;FIXME: Why?
|
|
;; (boundary (mml-compute-boundary cont))
|
|
(cipher (mml-secure-epg-encrypt 'CMS cont)))
|
|
(delete-region (point-min) (point-max))
|
|
(goto-char (point-min))
|
|
(insert "\
|
|
Content-Type: application/pkcs7-mime;
|
|
smime-type=enveloped-data;
|
|
name=smime.p7m
|
|
Content-Transfer-Encoding: base64
|
|
Content-Disposition: attachment; filename=smime.p7m
|
|
|
|
")
|
|
(insert (base64-encode-string cipher))
|
|
(goto-char (point-max))))
|
|
|
|
(defun mml-smime-epg-verify (handle ctl)
|
|
(catch 'error
|
|
(let ((inhibit-redisplay t)
|
|
context part signature) ;; plain signature-file
|
|
(when (or (null (setq part (mm-find-raw-part-by-type
|
|
ctl (or (mm-handle-multipart-ctl-parameter
|
|
ctl 'protocol)
|
|
"application/pkcs7-signature")
|
|
t)))
|
|
(null (setq signature (or (mm-find-part-by-type
|
|
(cdr handle)
|
|
"application/pkcs7-signature"
|
|
nil t)
|
|
(mm-find-part-by-type
|
|
(cdr handle)
|
|
"application/x-pkcs7-signature"
|
|
nil t)))))
|
|
(mm-sec-error 'gnus-info "Corrupted")
|
|
(throw 'error handle))
|
|
(setq part (replace-regexp-in-string "\n" "\r\n" part)
|
|
context (epg-make-context 'CMS))
|
|
(condition-case error
|
|
;; (setq plain
|
|
(epg-verify-string context (mm-get-part signature) part) ;;)
|
|
(error
|
|
(mm-sec-error 'gnus-info "Failed")
|
|
(mm-sec-status 'gnus-details (if (eq (car error) 'quit)
|
|
"Quit."
|
|
(format "%S" error)))
|
|
(throw 'error handle)))
|
|
(mm-sec-status
|
|
'gnus-info
|
|
(epg-verify-result-to-string (epg-context-result-for context 'verify)))
|
|
handle)))
|
|
|
|
(defun mml-smime-epg-verify-test (_handle _ctl)
|
|
t)
|
|
|
|
(provide 'mml-smime)
|
|
|
|
;;; mml-smime.el ends here
|