projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(auth-source-netrc-parse): Accept a number as the port spec, too.
[gnus]
/
lisp
/
smime.el
diff --git
a/lisp/smime.el
b/lisp/smime.el
index
7a89473
..
5a70798
100644
(file)
--- a/
lisp/smime.el
+++ b/
lisp/smime.el
@@
-1,27
+1,24
@@
;;; smime.el --- S/MIME support library
;;; smime.el --- S/MIME support library
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2011 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
;; This file is part of GNU Emacs.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
;; 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, or (at you
r
-;; option) any later version.
+;; 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, o
r
+;;
(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.
+;; 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
+;; G
NU G
eneral Public License for more details.
;; You should have received a copy of the GNU General Public License
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-44,7
+41,7
@@
;; done on messages encoded in these formats. The terminology chosen
;; reflect this.
;;
;; done on messages encoded in these formats. The terminology chosen
;; reflect this.
;;
-;; The home of this file is in Gnus
CVS
, but also available from
+;; The home of this file is in Gnus, but also available from
;; http://josefsson.org/smime.html.
;;; Quick introduction:
;; http://josefsson.org/smime.html.
;;; Quick introduction:
@@
-65,7
+62,7
@@
;;
;; Now you should be able to sign messages! Create a buffer and write
;; something and run M-x smime-sign-buffer RET RET and you should see
;;
;; Now you should be able to sign messages! Create a buffer and write
;; something and run M-x smime-sign-buffer RET RET and you should see
-;; your message MIME armo
u
red and a signature. Encryption, M-x
+;; your message MIME armored and a signature. Encryption, M-x
;; smime-encrypt-buffer, should also work.
;;
;; To be able to verify messages you need to build up trust with
;; smime-encrypt-buffer, should also work.
;;
;; To be able to verify messages you need to build up trust with
@@
-121,7
+118,7
@@
;;; Code:
;;; Code:
-;; For Emacs <
22.2
.
+;; For Emacs <
22.2 and XEmacs
.
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(require 'dig)
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
(require 'dig)
@@
-305,7
+302,7
@@
key and certificate itself."
(smime-new-details-buffer)
(let* ((certfiles (and (cdr-safe keyfile) (cadr keyfile)))
(keyfile (or (car-safe keyfile) keyfile))
(smime-new-details-buffer)
(let* ((certfiles (and (cdr-safe keyfile) (cadr keyfile)))
(keyfile (or (car-safe keyfile) keyfile))
- (buffer (generate-new-buffer
(generate-new-buffer-name " *smime*")
))
+ (buffer (generate-new-buffer
" *smime*"
))
(passphrase (smime-ask-passphrase (expand-file-name keyfile)))
(tmpfile (smime-make-temp-file "smime")))
(if passphrase
(passphrase (smime-ask-passphrase (expand-file-name keyfile)))
(tmpfile (smime-make-temp-file "smime")))
(if passphrase
@@
-340,7
+337,7
@@
If encryption fails, the buffer is not modified. Region is assumed to
have proper MIME tags. CERTFILES is a list of filenames, each file
is expected to contain of a PEM encoded certificate."
(smime-new-details-buffer)
have proper MIME tags. CERTFILES is a list of filenames, each file
is expected to contain of a PEM encoded certificate."
(smime-new-details-buffer)
- (let ((buffer (generate-new-buffer
(generate-new-buffer-name " *smime*")
))
+ (let ((buffer (generate-new-buffer
" *smime*"
))
(tmpfile (smime-make-temp-file "smime")))
(prog1
(when (prog1
(tmpfile (smime-make-temp-file "smime")))
(prog1
(when (prog1
@@
-373,12
+370,9
@@
KEYFILE should contain a PEM encoded key and certificate."
(if keyfile
keyfile
(smime-get-key-with-certs-by-email
(if keyfile
keyfile
(smime-get-key-with-certs-by-email
- (completing-read
- (concat "Sign using key"
- (if smime-keys
- (concat " (default " (caar smime-keys) "): ")
- ": "))
- smime-keys nil nil (car-safe (car-safe smime-keys))))))
+ (gnus-completing-read
+ "Sign using key"
+ smime-keys nil (car-safe (car-safe smime-keys))))))
(error "Signing failed"))))
(defun smime-encrypt-buffer (&optional certfiles buffer)
(error "Signing failed"))))
(defun smime-encrypt-buffer (&optional certfiles buffer)
@@
-431,15
+425,14
@@
Any details (stdout and stderr) are left in the buffer specified by
(insert-buffer-substring smime-details-buffer)
nil))
(insert-buffer-substring smime-details-buffer)
nil))
-(defvar from)
-
-(defun smime-decrypt-region (b e keyfile)
+(defun smime-decrypt-region (b e keyfile &optional from)
"Decrypt S/MIME message in region between B and E with key in KEYFILE.
"Decrypt S/MIME message in region between B and E with key in KEYFILE.
+Optional FROM specifies sender's mail address.
On success, replaces region with decrypted data and return non-nil.
Any details (stderr on success, stdout and stderr on error) are left
in the buffer specified by `smime-details-buffer'."
(smime-new-details-buffer)
On success, replaces region with decrypted data and return non-nil.
Any details (stderr on success, stdout and stderr on error) are left
in the buffer specified by `smime-details-buffer'."
(smime-new-details-buffer)
- (let ((buffer (generate-new-buffer
(generate-new-buffer-name " *smime*")
))
+ (let ((buffer (generate-new-buffer
" *smime*"
))
CAs (passphrase (smime-ask-passphrase (expand-file-name keyfile)))
(tmpfile (smime-make-temp-file "smime")))
(if passphrase
CAs (passphrase (smime-ask-passphrase (expand-file-name keyfile)))
(tmpfile (smime-make-temp-file "smime")))
(if passphrase
@@
-457,8
+450,7
@@
in the buffer specified by `smime-details-buffer'."
(delete-file tmpfile)))
(progn
(delete-region b e)
(delete-file tmpfile)))
(progn
(delete-region b e)
- (when (boundp 'from)
- ;; `from' is dynamically bound in mm-dissect.
+ (when from
(insert "From: " from "\n"))
(insert-buffer-substring buffer)
(kill-buffer buffer)
(insert "From: " from "\n"))
(insert-buffer-substring buffer)
(kill-buffer buffer)
@@
-504,11
+496,9
@@
in the buffer specified by `smime-details-buffer'."
(expand-file-name
(or keyfile
(smime-get-key-by-email
(expand-file-name
(or keyfile
(smime-get-key-by-email
- (completing-read
- (concat "Decipher using key"
- (if smime-keys (concat " (default " (caar smime-keys) "): ")
- ": "))
- smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
+ (gnus-completing-read
+ "Decipher using key"
+ smime-keys nil (car-safe (car-safe smime-keys)))))))))
;; Various operations
;; Various operations
@@
-594,17
+584,20
@@
A string or a list of strings is returned."
(kill-buffer digbuf)
retbuf))
(kill-buffer digbuf)
retbuf))
+(declare-function ldap-search "ldap"
+ (filter &optional host attributes attrsonly withdn))
+
(defun smime-cert-by-ldap-1 (mail host)
"Get cetificate for MAIL from the ldap server at HOST."
(let ((ldapresult
(funcall
(defun smime-cert-by-ldap-1 (mail host)
"Get cetificate for MAIL from the ldap server at HOST."
(let ((ldapresult
(funcall
- (if (or (featurep 'xemacs)
- ;; For Emacs >= 22 we don't need smime-ldap.el
- (< emacs-major-version 22))
+ (if (featurep 'xemacs)
(progn
(require 'smime-ldap)
'smime-ldap-search)
(progn
(require 'smime-ldap)
'smime-ldap-search)
- 'ldap-search)
+ (progn
+ (require 'ldap)
+ 'ldap-search))
(concat "mail=" mail)
host '("userCertificate") nil))
(retbuf (generate-new-buffer (format "*certificate for %s*" mail)))
(concat "mail=" mail)
host '("userCertificate") nil))
(retbuf (generate-new-buffer (format "*certificate for %s*" mail)))
@@
-651,19
+644,18
@@
A string or a list of strings is returned."
(defvar smime-buffer "*SMIME*")
(defvar smime-buffer "*SMIME*")
-(defvar smime-mode-map
nil)
-
(put 'smime-mode 'mode-class 'special
)
-
-(unless smime-mode-map
-
(setq smime-mode-map (make-sparse-keymap)
)
-
(suppress-keymap smime-mode-map
)
+(defvar smime-mode-map
+
(let ((map (make-sparse-keymap))
)
+ (suppress-keymap map)
+ (define-key map "q" 'smime-exit)
+
(define-key map "f" 'smime-certificate-info
)
+
map)
)
- (define-key smime-mode-map "q" 'smime-exit)
- (define-key smime-mode-map "f" 'smime-certificate-info))
+(autoload 'gnus-completing-read "gnus-util")
-(
autoload 'gnus-run-mode-hooks "gnus-util"
)
-
-(defun smime-mode ()
+(
put 'smime-mode 'mode-class 'special
)
+(define-derived-mode smime-mode fundamental-mode ;special-mode
+ "SMIME"
"Major mode for browsing, viewing and fetching certificates.
All normal editing commands are switched off.
"Major mode for browsing, viewing and fetching certificates.
All normal editing commands are switched off.
@@
-672,16
+664,10
@@
All normal editing commands are switched off.
The following commands are available:
\\{smime-mode-map}"
The following commands are available:
\\{smime-mode-map}"
- (interactive)
- (kill-all-local-variables)
- (setq major-mode 'smime-mode)
- (setq mode-name "SMIME")
(setq mode-line-process nil)
(setq mode-line-process nil)
- (use-local-map smime-mode-map)
(buffer-disable-undo)
(setq truncate-lines t)
(buffer-disable-undo)
(setq truncate-lines t)
- (setq buffer-read-only t)
- (gnus-run-mode-hooks 'smime-mode-hook))
+ (setq buffer-read-only t))
(defun smime-certificate-info (certfile)
(interactive "fCertificate file: ")
(defun smime-certificate-info (certfile)
(interactive "fCertificate file: ")
@@
-710,8
+696,7
@@
The following commands are available:
"Go to the SMIME buffer."
(interactive)
(unless (get-buffer smime-buffer)
"Go to the SMIME buffer."
(interactive)
(unless (get-buffer smime-buffer)
- (save-excursion
- (set-buffer (get-buffer-create smime-buffer))
+ (with-current-buffer (get-buffer-create smime-buffer)
(smime-mode)))
(smime-draw-buffer)
(switch-to-buffer smime-buffer))
(smime-mode)))
(smime-draw-buffer)
(switch-to-buffer smime-buffer))
@@
-731,5
+716,4
@@
The following commands are available:
(provide 'smime)
(provide 'smime)
-;;; arch-tag: e3f9b938-5085-4510-8a11-6625269c9a9e
;;; smime.el ends here
;;; smime.el ends here