security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-01 22:28:02 +02:00
Code Activity

Align ticker to the full or half second.

Browse Source
This commit is contained in:
Werner Koch 2008-12-08 19:10:42 +00:00
parent e46668599d
commit 78ff45c49e
5 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2008-12-08 Werner Koch <wk@g10code.com>
* gpg-agent.c (handle_connections): Sync the ticker to the next
full second. This is bug#871.
2008-12-05 Werner Koch <wk@g10code.com> 2008-12-05 Werner Koch <wk@g10code.com>
* minip12.c (decrypt_block): Fix const modified of CHARSETS. * minip12.c (decrypt_block): Fix const modified of CHARSETS.

16
agent/gpg-agent.c
View File

@ -1794,10 +1794,20 @@ handle_connections (gnupg_fd_t listen_fd, gnupg_fd_t listen_fd_ssh)
FD_ZERO (&fdset); FD_ZERO (&fdset);
} }
/* Create a timeout event if needed. */ /* Create a timeout event if needed. To help with power saving
we syncronize the ticks to the next full second. */
if (!time_ev) if (!time_ev)
time_ev = pth_event (PTH_EVENT_TIME, {
pth_timeout (TIMERTICK_INTERVAL, 0)); pth_time_t nexttick;
nexttick = pth_timeout (TIMERTICK_INTERVAL, 0);
if (nexttick.tv_usec > 10) /* Use a 10 usec threshhold. */
{
nexttick.tv_sec++;
nexttick.tv_usec = 0;
}
time_ev = pth_event (PTH_EVENT_TIME, nexttick);
}
/* POSIX says that fd_set should be implemented as a structure, /* POSIX says that fd_set should be implemented as a structure,
thus a simple assignment is fine to copy the entire set. */ thus a simple assignment is fine to copy the entire set. */

35
doc/gpg.texi
View File

@ -226,8 +226,8 @@ Store only (make a simple RFC1991 literal data packet).
@item --decrypt @item --decrypt
@itemx -d @itemx -d
@opindex decrypt @opindex decrypt
Decrypt the file given on the command line (or @code{stdin} if no file Decrypt the file given on the command line (or STDIN if no file
is specified) and write it to stdout (or the file specified with is specified) and write it to STDOUT (or the file specified with
@option{--output}). If the decrypted file is signed, the signature is also @option{--output}). If the decrypted file is signed, the signature is also
verified. This command differs from the default operation, as it never verified. This command differs from the default operation, as it never
writes to the filename which is included in the file and it rejects writes to the filename which is included in the file and it rejects
@ -237,19 +237,19 @@ files which don't begin with an encrypted message.
@opindex verify @opindex verify
Assume that the first argument is a signed file or a detached signature Assume that the first argument is a signed file or a detached signature
and verify it without generating any output. With no arguments, the and verify it without generating any output. With no arguments, the
signature packet is read from stdin. If only a sigfile is given, it may signature packet is read from STDIN. If only a sigfile is given, it may
be a complete signature or a detached signature, in which case the be a complete signature or a detached signature, in which case the
signed stuff is expected in a file without the ".sig" or ".asc" signed stuff is expected in a file without the ".sig" or ".asc"
extension. With more than 1 argument, the first should be a detached extension. With more than 1 argument, the first should be a detached
signature and the remaining files are the signed stuff. To read the signature and the remaining files are the signed stuff. To read the
signed stuff from stdin, use @samp{-} as the second filename. For signed stuff from STDIN, use @samp{-} as the second filename. For
security reasons a detached signature cannot read the signed material security reasons a detached signature cannot read the signed material
from stdin without denoting it in the above way. from STDIN without denoting it in the above way.
@item --multifile @item --multifile
@opindex multifile @opindex multifile
This modifies certain other commands to accept multiple files for This modifies certain other commands to accept multiple files for
processing on the command line or read from stdin with each filename on processing on the command line or read from STDIN with each filename on
a separate line. This allows for many files to be processed at a separate line. This allows for many files to be processed at
once. @option{--multifile} may currently be used along with once. @option{--multifile} may currently be used along with
@option{--verify}, @option{--encrypt}, and @option{--decrypt}. Note that @option{--verify}, @option{--encrypt}, and @option{--decrypt}. Note that
@ -394,7 +394,7 @@ removed first. In batch mode the key must be specified by fingerprint.
@opindex export @opindex export
Either export all keys from all keyrings (default keyrings and those Either export all keys from all keyrings (default keyrings and those
registered via option @option{--keyring}), or if at least one name is given, registered via option @option{--keyring}), or if at least one name is given,
those of the given name. The new keyring is written to stdout or to the those of the given name. The new keyring is written to STDOUT or to the
file given with option @option{--output}. Use together with file given with option @option{--output}. Use together with
@option{--armor} to mail those keys. @option{--armor} to mail those keys.
@ -487,14 +487,14 @@ a check is needed. To force a run even in batch mode add the option
@item --export-ownertrust @item --export-ownertrust
@opindex export-ownertrust @opindex export-ownertrust
Send the ownertrust values to stdout. This is useful for backup purposes Send the ownertrust values to STDOUT. This is useful for backup purposes
as these values are the only ones which can't be re-created from a as these values are the only ones which can't be re-created from a
corrupted trust DB. corrupted trust DB.
@item --import-ownertrust @item --import-ownertrust
@opindex import-ownertrust @opindex import-ownertrust
Update the trustdb with the ownertrust values stored in @code{files} (or Update the trustdb with the ownertrust values stored in @code{files} (or
stdin if not given); existing values will be overwritten. STDIN if not given); existing values will be overwritten.
@item --rebuild-keydb-caches @item --rebuild-keydb-caches
@opindex rebuild-keydb-caches @opindex rebuild-keydb-caches
@ -505,7 +505,7 @@ situations too.
@item --print-md @code{algo} @item --print-md @code{algo}
@itemx --print-mds @itemx --print-mds
@opindex print-md @opindex print-md
Print message digest of algorithm ALGO for all given files or stdin. 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.
@ -957,7 +957,12 @@ Try to be as quiet as possible.
@opindex batch @opindex batch
@opindex no-batch @opindex no-batch
Use batch mode. Never ask, do not allow interactive commands. Use batch mode. Never ask, do not allow interactive commands.
@option{--no-batch} disables this option. @option{--no-batch} disables this option. Note that even with a
filename given on the command line, gpg might still need to read from
STDIN (in particular if gpg figures that the input is a
detached signature and no data file has been specified). Thus if you
do not want to feed data via STDIN, you should connect STDIN to
@file{/dev/null}.
@item --no-tty @item --no-tty
@opindex no-tty @opindex no-tty
@ -1104,7 +1109,7 @@ and "%%" for an actual percent sign. If neither %i or %I are present,
then the photo will be supplied to the viewer on standard input. then the photo will be supplied to the viewer on standard input.
The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k' The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
stdin". Note that if your image viewer program is not secure, then STDIN". Note that if your image viewer program is not secure, then
executing it from GnuPG does not make it secure. executing it from GnuPG does not make it secure.
@item --exec-path @code{string} @item --exec-path @code{string}
@ -2118,7 +2123,7 @@ Same as @option{--status-fd}, except the status data is written to file
@code{file}. @code{file}.
@item --logger-fd @code{n} @item --logger-fd @code{n}
Write log output to file descriptor @code{n} and not to stderr. Write log output to file descriptor @code{n} and not to STDERR.
@item --log-file @code{file} @item --log-file @code{file}
@itemx --logger-file @code{file} @itemx --logger-file @code{file}
@ -2310,7 +2315,7 @@ passphrase. Defaults to 1 repetition.
@item --passphrase-fd @code{n} @item --passphrase-fd @code{n}
Read the passphrase from file descriptor @code{n}. Only the first line Read the passphrase from file descriptor @code{n}. Only the first line
will be read from file descriptor @code{n}. If you use 0 for @code{n}, will be read from file descriptor @code{n}. If you use 0 for @code{n},
the passphrase will be read from stdin. This can only be used if only the passphrase will be read from STDIN. This can only be used if only
one passphrase is supplied. one passphrase is supplied.
@ifclear gpgone @ifclear gpgone
Note that this passphrase is only used if the option @option{--batch} Note that this passphrase is only used if the option @option{--batch}
@ -2771,7 +2776,7 @@ is *very* easy to spy out your passphrase!
If you are going to verify detached signatures, make sure that the If you are going to verify detached signatures, make sure that the
program knows about it; either give both filenames on the command line program knows about it; either give both filenames on the command line
or use @samp{-} to specify stdin. or use @samp{-} to specify STDIN.
@mansect interoperability @mansect interoperability
@chapheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS @chapheading INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS

6
scd/ChangeLog
View File

@ -1,3 +1,9 @@
2008-12-08 Werner Koch <wk@g10code.com>
* scdaemon.c (handle_connections): Sync ticker to the next full
interval.
(TIMERTICK_INTERVAL_USEC): Change to 500ms.
2008-12-05 Werner Koch <wk@g10code.com> 2008-12-05 Werner Koch <wk@g10code.com>
* app-openpgp.c (app_local_s): Add field ALGO_ATTR_CHANGE. * app-openpgp.c (app_local_s): Add field ALGO_ATTR_CHANGE.

26
scd/scdaemon.c
View File

@ -156,7 +156,7 @@ static ARGPARSE_OPTS opts[] = {
#define DEFAULT_PCSC_DRIVER "libpcsclite.so" #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
#endif #endif
/* The timer tick used for housekeeping stuff. We poll every 250ms to /* The timer tick used for housekeeping stuff. We poll every 500ms to
let the user immediately know a status change. let the user immediately know a status change.
This is not too good for power saving but given that there is no This is not too good for power saving but given that there is no
@ -167,7 +167,7 @@ static ARGPARSE_OPTS opts[] = {
mechanism. Given that a native thread could only be used under W32 mechanism. Given that a native thread could only be used under W32
we don't do that at all. */ we don't do that at all. */
#define TIMERTICK_INTERVAL_SEC (0) #define TIMERTICK_INTERVAL_SEC (0)
#define TIMERTICK_INTERVAL_USEC (250000) #define TIMERTICK_INTERVAL_USEC (500000)
/* Flag to indicate that a shutdown was requested. */ /* Flag to indicate that a shutdown was requested. */
static int shutdown_pending; static int shutdown_pending;
@ -1152,11 +1152,25 @@ handle_connections (int listen_fd)
listen_fd = -1; listen_fd = -1;
} }
/* Create a timeout event if needed. */ /* Create a timeout event if needed. Round it up to the next
microsecond interval to help with power saving. */
if (!time_ev) if (!time_ev)
time_ev = pth_event (PTH_EVENT_TIME, {
pth_timeout (TIMERTICK_INTERVAL_SEC, pth_time_t nexttick = pth_timeout (TIMERTICK_INTERVAL_SEC,
TIMERTICK_INTERVAL_USEC)); TIMERTICK_INTERVAL_USEC/2);
if ((nexttick.tv_usec % (TIMERTICK_INTERVAL_USEC/2)) > 10)
{
nexttick.tv_usec = ((nexttick.tv_usec
/(TIMERTICK_INTERVAL_USEC/2))
+ 1) * (TIMERTICK_INTERVAL_USEC/2);
if (nexttick.tv_usec >= 1000000)
{
nexttick.tv_sec++;
nexttick.tv_usec = 0;
}
}
time_ev = pth_event (PTH_EVENT_TIME, nexttick);
}
/* POSIX says that fd_set should be implemented as a structure, /* POSIX says that fd_set should be implemented as a structure,
thus a simple assignment is fine to copy the entire set. */ thus a simple assignment is fine to copy the entire set. */