projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-summary-refer-thread): Implement a version that uses *-request-thread.
[gnus]
/
lisp
/
mml-smime.el
diff --git
a/lisp/mml-smime.el
b/lisp/mml-smime.el
index
af4d1bf
..
33050fe
100644
(file)
--- a/
lisp/mml-smime.el
+++ b/
lisp/mml-smime.el
@@
-1,7
+1,7
@@
;;; mml-smime.el --- S/MIME support for MML
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
;;; mml-smime.el --- S/MIME support for MML
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008, 2009
, 2010
Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: Gnus, MIME, S/MIME, MML
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: Gnus, MIME, S/MIME, MML
@@
-25,7
+25,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))))
(eval-and-compile
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
@@
-53,11
+53,6
@@
mml-smime-epg-verify
mml-smime-epg-verify-test)))
mml-smime-epg-verify
mml-smime-epg-verify-test)))
-(defcustom mml-smime-verbose mml-secure-verbose
- "If non-nil, ask the user about the current operation more verbosely."
- :group 'mime-security
- :type 'boolean)
-
(defcustom mml-smime-cache-passphrase mml-secure-cache-passphrase
"If t, cache passphrase."
:group 'mime-security
(defcustom mml-smime-cache-passphrase mml-secure-cache-passphrase
"If t, cache passphrase."
:group 'mime-security
@@
-166,10
+161,10
@@
Whether the passphrase is cached at all is controlled by
"")))))
(and from (smime-get-key-by-email from)))
(smime-get-key-by-email
"")))))
(and from (smime-get-key-by-email from)))
(smime-get-key-by-email
- (
completing-read "Sign this part with what signature?
"
-
smime-keys
nil nil
- (and (listp (car-safe smime-keys))
- (caar smime-keys))))))))
+ (
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
(defun mml-smime-get-file-cert ()
(ignore-errors
@@
-218,15
+213,16
@@
Whether the passphrase is cached at all is controlled by
(quit))
result))
(quit))
result))
-(autoload 'gnus-completing-read
-with-default
"gnus-util")
+(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)
(defun mml-smime-openssl-encrypt-query ()
;; todo: try dns/ldap automatically first, before prompting user
(let (certs done)
(while (not done)
- (ecase (read (gnus-completing-read-with-default
- "ldap" "Fetch certificate from"
- '(("dns") ("ldap") ("file")) nil t))
+ (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
(dns (setq certs (append certs
(mml-smime-get-dns-cert))))
(ldap (setq certs (append certs
@@
-381,7
+377,7
@@
Whether the passphrase is cached at all is controlled by
(or (message-options-get 'mml-smime-epg-signers)
(message-options-set
'mml-smime-epg-signers
(or (message-options-get 'mml-smime-epg-signers)
(message-options-set
'mml-smime-epg-signers
- (if
mml-smime-verbose
+ (if
(eq mm-sign-option 'guided)
(epa-select-keys context "\
Select keys for signing.
If no one is selected, default secret key is used. "
(epa-select-keys context "\
Select keys for signing.
If no one is selected, default secret key is used. "
@@
-462,7
+458,7
@@
Content-Disposition: attachment; filename=smime.p7s
(message-options-set 'message-recipients
(read-string "Recipients: ")))
"[ \f\t\n\r\v,]+"))))
(message-options-set 'message-recipients
(read-string "Recipients: ")))
"[ \f\t\n\r\v,]+"))))
- (if
mml-smime-verbose
+ (if
(eq mm-encrypt-option 'guided)
(setq recipients
(epa-select-keys context "\
Select recipients for encryption.
(setq recipients
(epa-select-keys context "\
Select recipients for encryption.
@@
-520,10
+516,14
@@
Content-Disposition: attachment; filename=smime.p7m
ctl 'protocol)
"application/pkcs7-signature")
t)))
ctl 'protocol)
"application/pkcs7-signature")
t)))
- (null (setq signature (mm-find-part-by-type
- (cdr handle)
- "application/pkcs7-signature"
- nil 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-set-handle-multipart-parameter
mm-security-handle 'gnus-info "Corrupted")
(throw 'error handle))
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-info "Corrupted")
(throw 'error handle))
@@
-550,5
+550,4
@@
Content-Disposition: attachment; filename=smime.p7m
(provide 'mml-smime)
(provide 'mml-smime)
-;; arch-tag: f1bf94d4-f2cd-4c6f-b059-ad69492817e2
;;; mml-smime.el ends here
;;; mml-smime.el ends here