projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add hooks for gcc handling
[gnus]
/
lisp
/
smime.el
diff --git
a/lisp/smime.el
b/lisp/smime.el
index
c25c9c6
..
73f4970
100644
(file)
--- a/
lisp/smime.el
+++ b/
lisp/smime.el
@@
-1,7
+1,6
@@
;;; smime.el --- S/MIME support library
;;; smime.el --- S/MIME support library
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: SMIME X.509 PEM OpenSSL
@@
-100,7
+99,7
@@
;;
;; I would include pointers to introductory text on concepts used in
;; this library here, but the material I've read are so horrible I
;;
;; I would include pointers to introductory text on concepts used in
;; this library here, but the material I've read are so horrible I
-;; don't want to recomend them.
+;; don't want to recom
m
end them.
;;
;; Why can't someone write a simple introduction to all this stuff?
;; Until then, much of this resemble security by obscurity.
;;
;; Why can't someone write a simple introduction to all this stuff?
;; Until then, much of this resemble security by obscurity.
@@
-181,7
+180,7
@@
File should contain certificates in PEM format."
(defcustom smime-certificate-directory "~/Mail/certs/"
"*Directory containing other people's certificates.
It should contain files named to the X.509 hash of the certificate,
(defcustom smime-certificate-directory "~/Mail/certs/"
"*Directory containing other people's certificates.
It should contain files named to the X.509 hash of the certificate,
-and the files themsel
f
should be in PEM format."
+and the files themsel
ves
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.
;The S/MIME library provide simple functionality for fetching
;certificates into this directory, so there is no need to populate it
;manually.
@@
-589,7
+588,7
@@
A string or a list of strings is returned."
(filter &optional host attributes attrsonly withdn))
(defun smime-cert-by-ldap-1 (mail host)
(filter &optional host attributes attrsonly withdn))
(defun smime-cert-by-ldap-1 (mail host)
- "Get cetificate for MAIL from the ldap server at HOST."
+ "Get ce
r
tificate for MAIL from the ldap server at HOST."
(let ((ldapresult
(funcall
(if (featurep 'xemacs)
(let ((ldapresult
(funcall
(if (featurep 'xemacs)
@@
-690,7
+689,7
@@
The following commands are available:
(dolist (key smime-keys)
(insert
(format "\t\t%s: %s\n" (car key) (cadr key))))
(dolist (key smime-keys)
(insert
(format "\t\t%s: %s\n" (car key) (cadr key))))
- (insert "\nTrusted Certificate Authorit
y
s:\n")
+ (insert "\nTrusted Certificate Authorit
ie
s:\n")
(insert "\nKnown Certificates:\n"))))
(defun smime ()
(insert "\nKnown Certificates:\n"))))
(defun smime ()