summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2013-10-28 17:04:48 +0900
committerDaiki Ueno <ueno@gnu.org>2013-10-28 17:04:48 +0900
commited42a87759dbf47cec58ae3764fe763e35c4dbdb (patch)
tree75212084e22d000e3c3b72bbb67d887d6812a9d4
parent7a4bc7be955367c0956002e11824843c0bd370a1 (diff)
downloademacs-ed42a87759dbf47cec58ae3764fe763e35c4dbdb.tar.gz
Document insecure elisp password caching is not usable with GnuPG 2.0.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/epa-file.el8
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f0eed1897b..aac29e86ad6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-28 Daiki Ueno <ueno@gnu.org>
+
+ * epa-file.el
+ (epa-file-cache-passphrase-for-symmetric-encryption): Document
+ that this option has no effect with GnuPG 2.0 (bug#15552).
+
2013-10-27 Xue Fuqiao <xfq.free@gmail.com>
* image.el (defimage):
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 5de768b426e..e3a91ac7c25 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -29,9 +29,11 @@
"If non-nil, cache passphrase for symmetric encryption.
For security reasons, this option is turned off by default and
-not recommended to use. Instead, consider using public-key
-encryption with gpg-agent which does the same job in a safer
-way."
+not recommended to use. Instead, consider using gpg-agent which
+does the same job in a safer way. See Info node `(epa) Caching
+Passphrases' for more information.
+
+Note that this option has no effect if you use GnuPG 2.0."
:type 'boolean
:group 'epa-file)