;;; smime.el --- S/MIME support library
-;; Copyright (c) 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (c) 2000, 2001, 2003 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
-;; This file is not a part of GNU Emacs, but the same permissions apply.
+;; 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
;;; Code:
(require 'dig)
-(require 'comint)
(eval-when-compile (require 'cl))
(defgroup smime nil
Directory should contain files (in PEM format) named to the X.509
hash of the certificate. This can be done using OpenSSL such as:
-$ ln -s ca.pem `openssl x509 -noout -hash -in ca.pem`
+$ ln -s ca.pem `openssl x509 -noout -hash -in ca.pem`.0
where `ca.pem' is the file containing a PEM encoded X.509 CA
certificate."
(defvar smime-details-buffer "*OpenSSL output*")
+;; Use mm-util?
(eval-and-compile
(defalias 'smime-make-temp-file
(if (fboundp 'make-temp-file)
(lambda (prefix &optional dir-flag) ;; Simple implementation
(expand-file-name
(make-temp-name prefix)
- temporary-file-directory)))))
+ (if (fboundp 'temp-directory)
+ (temp-directory)
+ temporary-file-directory))))))
;; Password dialog function
(defun smime-ask-passphrase ()
"Asks the passphrase to unlock the secret key."
(let ((passphrase
- (comint-read-noecho
- "Passphrase for secret key (RET for no passphrase): " t)))
+ (read-passwd
+ "Passphrase for secret key (RET for no passphrase): ")))
(if (string= passphrase "")
nil
passphrase)))
;; Sign+encrypt region
-(defun smime-sign-region (b e keyfiles)
- "Sign region with certified key in KEYFILES.
+(defun smime-sign-region (b e keyfile)
+ "Sign region with certified key in KEYFILE.
If signing fails, the buffer is not modified. Region is assumed to
-have proper MIME tags. KEYFILES is expected to contain a PEM encoded
-private key and certificate as its car, and a list of additional certificates
-to include in its caar."
+have proper MIME tags. KEYFILE is expected to contain a PEM encoded
+private key and certificate as its car, and a list of additional
+certificates to include in its caar. If no additional certificates is
+included, KEYFILE may be the file containing the PEM encoded private
+key and certificate itself."
(smime-new-details-buffer)
- (let ((keyfile (car keyfiles))
- (certfiles (and (cdr keyfiles) (cadr keyfiles)))
+ (let ((keyfile (or (car-safe keyfile) keyfile))
+ (certfiles (and (cdr-safe keyfile) (cadr keyfile)))
(buffer (generate-new-buffer (generate-new-buffer-name " *smime*")))
(passphrase (smime-ask-passphrase))
(tmpfile (smime-make-temp-file "smime")))
(smime-sign-region
(point-min) (point-max)
(if keyfile
- (list keyfile (smime-get-certfiles keyfile smime-keys))
- (smime-get-key-by-email
- (completing-read "Sign using which signature? " smime-keys nil nil
- (and (listp (car-safe smime-keys))
- (cdr smime-keys))))))))
+ keyfile
+ (smime-get-key-with-certs-by-email
+ (completing-read
+ (concat "Sign using which key? "
+ (if smime-keys (concat "(default " (caar smime-keys) ") ")
+ ""))
+ smime-keys nil nil (car-safe (car-safe smime-keys))))))))
(defun smime-encrypt-buffer (&optional certfiles buffer)
"S/MIME encrypt BUFFER for recipients specified in CERTFILES.
(insert-buffer-substring smime-details-buffer)
nil))
+(eval-when-compile
+ (defvar from))
+
(defun smime-decrypt-region (b e keyfile)
"Decrypt S/MIME message in region between B and E with key in KEYFILE.
On success, replaces region with decrypted data and return non-nil.
(delete-file tmpfile)))
(progn
(delete-region b e)
+ (when (boundp 'from)
+ ;; `from' is dynamically bound in mm-dissect.
+ (insert "From: " from "\n"))
(insert-buffer-substring buffer)
(kill-buffer buffer)
t)
(expand-file-name
(or keyfile
(smime-get-key-by-email
- (completing-read "Decrypt with which key? " smime-keys nil nil
- (and (listp (car-safe smime-keys))
- (caar smime-keys)))))))))
+ (completing-read
+ (concat "Decipher using which key? "
+ (if smime-keys (concat "(default " (caar smime-keys) ") ")
+ ""))
+ smime-keys nil nil (car-safe (car-safe smime-keys)))))))))
;; Various operations
"Get email addresses contained in certificate between points B and E.
A string or a list of strings is returned."
(smime-new-details-buffer)
- (when (smime-call-openssl-region
+ (when (smime-call-openssl-region
b e smime-details-buffer "x509" "-email" "-noout")
(delete-region b e)
(insert-buffer-substring smime-details-buffer)
(caddr curkey)
(smime-get-certfiles keyfile otherkeys)))))
+;; Use mm-util?
(eval-and-compile
(defalias 'smime-point-at-eol
(if (fboundp 'point-at-eol)
(defun smime-get-key-by-email (email)
(cadr (assoc email smime-keys)))
+(defun smime-get-key-with-certs-by-email (email)
+ (cdr (assoc email smime-keys)))
+
(provide 'smime)
;;; smime.el ends here