diff options
Diffstat (limited to 'lisp/gnus/smime.el')
| -rw-r--r-- | lisp/gnus/smime.el | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index ae5d171d871..8900be5e4f1 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el @@ -135,8 +135,7 @@ certificates to be sent with every message to each address." :type '(repeat (list (string :tag "Mail address") (file :tag "File name") (repeat :tag "Additional certificate files" - (file :tag "File name")))) - :group 'smime) + (file :tag "File name"))))) (defcustom smime-CA-directory nil "Directory containing certificates for CAs you trust. @@ -148,16 +147,14 @@ $ 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." :type '(choice (const :tag "none" nil) - directory) - :group 'smime) + directory)) (defcustom smime-CA-file nil "Files containing certificates for CAs you trust. File should contain certificates in PEM format." :version "22.1" :type '(choice (const :tag "none" nil) - file) - :group 'smime) + file)) (defcustom smime-certificate-directory "~/Mail/certs/" "Directory containing other people's certificates. @@ -166,8 +163,7 @@ and the files themselves should be in PEM format." ;The S/MIME library provide simple functionality for fetching ;certificates into this directory, so there is no need to populate it ;manually. - :type 'directory - :group 'smime) + :type 'directory) (defcustom smime-openssl-program (and (condition-case () @@ -176,8 +172,7 @@ and the files themselves should be in PEM format." "openssl") "Name of OpenSSL binary or nil if none." :type '(choice string - (const :tag "none" nil)) - :group 'smime) + (const :tag "none" nil))) ;; OpenSSL option to select the encryption cipher @@ -191,8 +186,7 @@ and the files themselves should be in PEM format." (const :tag "AES 128 bits" "-aes128") (const :tag "RC2 40 bits" "-rc2-40") (const :tag "RC2 64 bits" "-rc2-64") - (const :tag "RC2 128 bits" "-rc2-128")) - :group 'smime) + (const :tag "RC2 128 bits" "-rc2-128"))) (defcustom smime-crl-check nil "Check revocation status of signers certificate using CRLs. @@ -212,24 +206,21 @@ certificate with .r0 as file name extension. At least OpenSSL version 0.9.7 is required for this to work." :type '(choice (const :tag "No check" nil) (const :tag "Check certificate" "-crl_check") - (const :tag "Check certificate chain" "-crl_check_all")) - :group 'smime) + (const :tag "Check certificate chain" "-crl_check_all"))) (defcustom smime-dns-server nil "DNS server to query certificates from. If nil, use system defaults." :version "22.1" :type '(choice (const :tag "System defaults") - string) - :group 'smime) + string)) (defcustom smime-ldap-host-list nil "A list of LDAP hosts with S/MIME user certificates. If needed search base, binddn, passwd, etc. for the LDAP host must be set in `ldap-host-parameters-alist'." :type '(repeat (string :tag "Host name")) - :version "23.1" ;; No Gnus - :group 'smime) + :version "23.1") ;; No Gnus (defvar smime-details-buffer "*OpenSSL output*") @@ -282,7 +273,7 @@ key and certificate itself." (setenv "GNUS_SMIME_PASSPHRASE" passphrase)) (prog1 (when (prog1 - (apply 'smime-call-openssl-region b e (list buffer tmpfile) + (apply #'smime-call-openssl-region b e (list buffer tmpfile) "smime" "-sign" "-signer" (expand-file-name keyfile) (append (smime-make-certfiles certfiles) @@ -314,9 +305,9 @@ is expected to contain of a PEM encoded certificate." (tmpfile (make-temp-file "smime"))) (prog1 (when (prog1 - (apply 'smime-call-openssl-region b e (list buffer tmpfile) + (apply #'smime-call-openssl-region b e (list buffer tmpfile) "smime" "-encrypt" smime-encrypt-cipher - (mapcar 'expand-file-name certfiles)) + (mapcar #'expand-file-name certfiles)) (with-current-buffer smime-details-buffer (insert-file-contents tmpfile) (delete-file tmpfile))) @@ -384,7 +375,7 @@ Any details (stdout and stderr) are left in the buffer specified by (with-temp-buffer (let ((result-buffer (current-buffer))) (with-current-buffer input-buffer - (if (apply 'smime-call-openssl-region b e (list result-buffer + (if (apply #'smime-call-openssl-region b e (list result-buffer smime-details-buffer) "smime" "-verify" "-out" "-" CAs) (with-current-buffer result-buffer @@ -397,7 +388,7 @@ Returns non-nil on success. Any details (stdout and stderr) are left in the buffer specified by `smime-details-buffer'." (smime-new-details-buffer) - (if (apply 'smime-call-openssl-region b e (list smime-details-buffer t) + (if (apply #'smime-call-openssl-region b e (list smime-details-buffer t) "smime" "-verify" "-noverify" "-out" `(,null-device)) t (insert-buffer-substring smime-details-buffer) @@ -416,7 +407,7 @@ in the buffer specified by `smime-details-buffer'." (if passphrase (setenv "GNUS_SMIME_PASSPHRASE" passphrase)) (if (prog1 - (apply 'smime-call-openssl-region b e + (apply #'smime-call-openssl-region b e (list buffer tmpfile) "smime" "-decrypt" "-recip" (expand-file-name keyfile) (if passphrase |