security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-02 16:43:03 +01:00
Code Activity

Fix a bug where scdaemon kills a non-daemon gpg-agent.

Browse Source 
Fix a passphrase cache annoyance.
This commit is contained in:
Werner Koch 2010-11-11 15:08:48 +00:00
parent 2bd66b59a2
commit 46ef7f6243
7 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -7,6 +7,9 @@ Noteworthy changes in version 2.0.17 (unreleased)
* Allow more hash algorithms with the OpenPGP v2 card. * Allow more hash algorithms with the OpenPGP v2 card.
* Fixed a bug where Scdaemon sends a signal to Gpg-agent running in
non-daemon mode.
Noteworthy changes in version 2.0.16 (2010-07-19) Noteworthy changes in version 2.0.16 (2010-07-19)
------------------------------------------------- -------------------------------------------------

13
agent/ChangeLog
View File

@ -1,3 +1,14 @@
2010-11-11 Werner Koch <wk@g10code.com>
* agent.h (opt): Add field SIGUSR2_ENABLED.
* gpg-agent.c (handle_connections): Set that flag.
* call-scd.c (start_scd): Enable events depending on this flag.
2010-09-30 Werner Koch <wk@g10code.com>
* findkey.c (unprotect): Do not put the passphrase into the cache
if it has been changed.
2010-09-24 Werner Koch <wk@g10code.com> 2010-09-24 Werner Koch <wk@g10code.com>
* gpg-agent.c (main, reread_configuration): Always test whether * gpg-agent.c (main, reread_configuration): Always test whether
@ -2551,7 +2562,7 @@ Fri Aug 18 14:27:14 CEST 2000 Werner Koch <wk@openit.de>
Copyright 2001, 2002, 2003, 2004, 2005, Copyright 2001, 2002, 2003, 2004, 2005,
2007, 2008, 2009 Free Software Foundation, Inc. 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

3
agent/agent.h
View File

@ -64,6 +64,9 @@ struct
/* True if we are listening on the standard socket. */ /* True if we are listening on the standard socket. */
int use_standard_socket; int use_standard_socket;
/* True if we handle sigusr2. */
int sigusr2_enabled;
const char *pinentry_program; /* Filename of the program to start as const char *pinentry_program; /* Filename of the program to start as
pinentry. */ pinentry. */
const char *scdaemon_program; /* Filename of the program to handle const char *scdaemon_program; /* Filename of the program to handle

15
agent/call-scd.c
View File

@ -408,17 +408,18 @@ start_scd (ctrl_t ctrl)
} }
/* Tell the scdaemon we want him to send us an event signal. */ /* Tell the scdaemon we want him to send us an event signal. */
{ if (opt.sigusr2_enabled)
char buf[100]; {
char buf[100];
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
snprintf (buf, sizeof buf, "OPTION event-signal=%lx", snprintf (buf, sizeof buf, "OPTION event-signal=%lx",
(unsigned long)get_agent_scd_notify_event ()); (unsigned long)get_agent_scd_notify_event ());
#else #else
snprintf (buf, sizeof buf, "OPTION event-signal=%d", SIGUSR2); snprintf (buf, sizeof buf, "OPTION event-signal=%d", SIGUSR2);
#endif #endif
assuan_transact (ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL); assuan_transact (ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL);
} }
primary_scd_ctx = ctx; primary_scd_ctx = ctx;
primary_scd_ctx_reusable = 0; primary_scd_ctx_reusable = 0;

5
agent/findkey.c
View File

@ -407,8 +407,9 @@ unprotect (ctrl_t ctrl, const char *desc_text,
return rc; return rc;
} }
} }
agent_put_cache (hexgrip, cache_mode, pi->pin, else
lookup_ttl? lookup_ttl (hexgrip) : 0); agent_put_cache (hexgrip, cache_mode, pi->pin,
lookup_ttl? lookup_ttl (hexgrip) : 0);
xfree (*keybuf); xfree (*keybuf);
*keybuf = arg.unprotected_key; *keybuf = arg.unprotected_key;
} }

4
agent/gpg-agent.c
View File

@ -1892,6 +1892,10 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
#endif #endif
time_ev = NULL; time_ev = NULL;
/* Set a flag to tell call-scd.c that it may enable event
notifications. */
opt.sigusr2_enabled = 1;
FD_ZERO (&fdset); FD_ZERO (&fdset);
FD_SET (FD2INT (listen_fd), &fdset); FD_SET (FD2INT (listen_fd), &fdset);
nfd = FD2INT (listen_fd); nfd = FD2INT (listen_fd);

40
doc/gpg.texi
View File

@ -1,5 +1,5 @@
@c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, @c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
@c 2008, 2009 Free Software Foundation, Inc. @c 2008, 2009, 2010 Free Software Foundation, Inc.
@c This is part of the GnuPG manual. @c This is part of the GnuPG manual.
@c For copying conditions, see the file gnupg.texi. @c For copying conditions, see the file gnupg.texi.
@ -415,8 +415,10 @@ normally not very useful and a security risk. The second form of the
command has the special property to render the secret part of the command has the special property to render the secret part of the
primary key useless; this is a GNU extension to OpenPGP and other primary key useless; this is a GNU extension to OpenPGP and other
implementations can not be expected to successfully import such a key. implementations can not be expected to successfully import such a key.
@ifclear gpgtwoone
See the option @option{--simple-sk-checksum} if you want to import such See the option @option{--simple-sk-checksum} if you want to import such
an exported key with an older OpenPGP implementation. an exported key with an older OpenPGP implementation.
@end ifclear
@item --import @item --import
@itemx --fast-import @itemx --fast-import
@ -527,12 +529,13 @@ Print message digest of algorithm ALGO for all given files or STDIN.
With the second form (or a deprecated "*" as algo) digests for all With the second form (or a deprecated "*" as algo) digests for all
available algorithms are printed. available algorithms are printed.
@item --gen-random @code{0|1|2} @item --gen-random @code{0|1|2} @code{count}
@opindex gen-random @opindex gen-random
Emit @var{count} random bytes of the given quality level. If count is Emit @var{count} random bytes of the given quality level 0, 1 or 2. If
not given or zero, an endless sequence of random bytes will be emitted. @var{count} is not given or zero, an endless sequence of random bytes
PLEASE, don't use this command unless you know what you are doing; it will be emitted. If used with @option{--armor} the output will be
may remove precious entropy from the system! base64 encoded. PLEASE, don't use this command unless you know what
you are doing; it may remove precious entropy from the system!
@item --gen-prime @code{mode} @code{bits} @item --gen-prime @code{mode} @code{bits}
@opindex gen-prime @opindex gen-prime
@ -1044,7 +1047,7 @@ Show any preferred keyserver URL in the @option{--list-sigs} or
@option{--check-sigs} listings. Defaults to no. @option{--check-sigs} listings. Defaults to no.
@item show-uid-validity @item show-uid-validity
Display the calculated validity of user IDs during public key listings. Display the calculated validity of user IDs during key listings.
Defaults to no. Defaults to no.
@item show-unusable-uids @item show-unusable-uids
@ -1549,6 +1552,7 @@ key signer (defaults to 3)
@item --max-cert-depth @code{n} @item --max-cert-depth @code{n}
Maximum depth of a certification chain (default is 5). Maximum depth of a certification chain (default is 5).
@ifclear gpgtwoone
@item --simple-sk-checksum @item --simple-sk-checksum
Secret keys are integrity protected by using a SHA-1 checksum. This Secret keys are integrity protected by using a SHA-1 checksum. This
method is part of the upcoming enhanced OpenPGP specification but method is part of the upcoming enhanced OpenPGP specification but
@ -1559,6 +1563,7 @@ a security risk. Note that using this option only takes effect when
the secret key is encrypted - the simplest way to make this happen is the secret key is encrypted - the simplest way to make this happen is
to change the passphrase on the key (even changing it to the same to change the passphrase on the key (even changing it to the same
value is acceptable). value is acceptable).
@end ifclear
@item --no-sig-cache @item --no-sig-cache
Do not cache the verification status of key signatures. Do not cache the verification status of key signatures.
@ -1883,11 +1888,17 @@ program that does not accept attribute user IDs. Defaults to yes.
Include designated revoker information that was marked as Include designated revoker information that was marked as
"sensitive". Defaults to no. "sensitive". Defaults to no.
@c Since GnuPG 2.1 gpg-agent manages the secret key and thus the
@c export-reset-subkey-passwd hack is not anymore justified. Such use
@c cases need to be implemented using a specialized secret key export
@c tool.
@ifclear gpgtwoone
@item export-reset-subkey-passwd @item export-reset-subkey-passwd
When using the @option{--export-secret-subkeys} command, this option resets When using the @option{--export-secret-subkeys} command, this option resets
the passphrases for all exported subkeys to empty. This is useful the passphrases for all exported subkeys to empty. This is useful
when the exported subkey is to be used on an unattended machine where when the exported subkey is to be used on an unattended machine where
a passphrase doesn't necessarily make sense. Defaults to no. a passphrase doesn't necessarily make sense. Defaults to no.
@end ifclear
@item export-clean @item export-clean
Compact (remove all signatures from) user IDs on the key being Compact (remove all signatures from) user IDs on the key being
@ -1963,10 +1974,11 @@ the type of the signature.
OpenPGP states that an implementation should generate v4 signatures OpenPGP states that an implementation should generate v4 signatures
but PGP versions 5 through 7 only recognize v4 signatures on key but PGP versions 5 through 7 only recognize v4 signatures on key
material. This option forces v3 signatures for signatures on data. material. This option forces v3 signatures for signatures on data.
Note that this option implies @option{--ask-sig-expire}, Note that this option implies @option{--no-ask-sig-expire}, and unsets
@option{--sig-policy-url}, @option{--sig-notation}, and @option{--sig-policy-url}, @option{--sig-notation}, and
@option{--sig-keyserver-url}, as these features cannot be used with v3 @option{--sig-keyserver-url}, as these features cannot be used with v3
signatures. @option{--no-force-v3-sigs} disables this option. signatures. @option{--no-force-v3-sigs} disables this option.
Defaults to no.
@item --force-v4-certs @item --force-v4-certs
@itemx --no-force-v4-certs @itemx --no-force-v4-certs
@ -2196,6 +2208,13 @@ Enable debug output from the included CCID driver for smartcards.
Note that this option is only available on some system. Note that this option is only available on some system.
@end ifset @end ifset
@item --faked-system-time @var{epoch}
@opindex faked-system-time
This option is only useful for testing; it sets the system time back or
forth to @var{epoch} which is the number of seconds elapsed since the year
1970. Alternatively @var{epoch} may be given as a full ISO time string
(e.g. "20070924T154812").
@item --enable-progress-filter @item --enable-progress-filter
Enable certain PROGRESS status outputs. This option allows frontends Enable certain PROGRESS status outputs. This option allows frontends
to display a progress indicator while gpg is processing larger files. to display a progress indicator while gpg is processing larger files.
@ -2533,10 +2552,7 @@ secret key.
When making a data signature, prompt for an expiration time. If this When making a data signature, prompt for an expiration time. If this
option is not specified, the expiration time set via option is not specified, the expiration time set via
@option{--default-sig-expire} is used. @option{--no-ask-sig-expire} @option{--default-sig-expire} is used. @option{--no-ask-sig-expire}
disables this option. Note that by default, @option{--force-v3-sigs} is disables this option.
set which also disables this option. If you want signature expiration,
you must set @option{--no-force-v3-sigs} as well as turning
@option{--ask-sig-expire} on.
@item --default-sig-expire @item --default-sig-expire
The default expiration time to use for signature expiration. Valid The default expiration time to use for signature expiration. Valid