aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--agent/call-pinentry.c12
-rw-r--r--doc/gpg-agent.texi2
2 files changed, 0 insertions, 14 deletions
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index a7db86890..5686998bf 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -353,18 +353,6 @@ start_pinentry (ctrl_t ctrl)
return unlock_pinentry (rc);
- /* Indicate to the pinentry that it may read from an external cache.
-
- It is essential that the pinentry respect this. If the cached
- password is not up to date and retry == 1, then, using a version
- of GPG Agent that doesn't support this, won't issue another pin
- request and the user won't get a chance to correct the
- password. */
- rc = assuan_transact (entry_ctx, "OPTION allow-external-password-cache",
- NULL, NULL, NULL, NULL, NULL, NULL);
- if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
- return unlock_pinentry (rc);
-
value = session_env_getenv (ctrl->session_env, "GPG_TTY");
if (value)
{
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 5c0dec773..b7b0d4ca1 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -352,7 +352,6 @@ Allow clients to use the loopback pinentry features; see the option
@option{pinentry-mode} for details.
@end ifset
-@ifset gpgtwoone
@item --no-allow-external-cache
@opindex no-allow-external-cache
Tell Pinentry not to enable features which use an external cache for
@@ -363,7 +362,6 @@ credentials with one master password and may have installed a Pinentry
which employs an additional external cache to implement such a policy.
By using this option the Pinentry is advised not to make use of such a
cache and instead always ask the user for the requested passphrase.
-@end ifset
@item --ignore-cache-for-signing
@opindex ignore-cache-for-signing