security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

(main) <gpgconf_list>: Fixed output for pcsc_driver.

Browse Source
This commit is contained in:
Werner Koch 2004-03-23 12:33:20 +00:00
parent 3b2e2e7418
commit 0c36e10633
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scd/ChangeLog
View File

@ -1,5 +1,12 @@
2004-03-23 Werner Koch <wk@gnupg.org>
* scdaemon.c (main) <gpgconf_list>: Fixed output for pcsc_driver.
2004-03-17 Werner Koch <wk@gnupg.org> 2004-03-17 Werner Koch <wk@gnupg.org>
* tlv.c (parse_ber_header): Do not check for tag overflow - it
does not make sense. Simplified the check for length overflow.
* scdaemon.c (main) <gpgconf>: Fixed default value quoting. * scdaemon.c (main) <gpgconf>: Fixed default value quoting.
2004-03-16 Werner Koch <wk@gnupg.org> 2004-03-16 Werner Koch <wk@gnupg.org>

2
scd/scdaemon.c
View File

@ -545,7 +545,7 @@ main (int argc, char **argv )
printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE ); printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE );
printf ("ctapi-driver:%lu:\n", GC_OPT_FLAG_NONE ); printf ("ctapi-driver:%lu:\n", GC_OPT_FLAG_NONE );
printf ("pcsc-driver:%lu:\"%s\":\n", printf ("pcsc-driver:%lu:\"%s:\n",
GC_OPT_FLAG_DEFAULT, DEFAULT_PCSC_DRIVER ); GC_OPT_FLAG_DEFAULT, DEFAULT_PCSC_DRIVER );
#ifdef HAVE_LIBUSB #ifdef HAVE_LIBUSB
printf ("disable-ccid:%lu:\n", GC_OPT_FLAG_NONE ); printf ("disable-ccid:%lu:\n", GC_OPT_FLAG_NONE );

17
scd/tlv.c
View File

@ -157,12 +157,6 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
tag = 0; tag = 0;
do do
{ {
/* Simple check against overflow. We limit our maximim tag
value more than needed but that should not be a problem
because I have nver encountered such large value. We
assume at least 32 bit integers. */
if (tag > (1 << 24))
return gpg_error (GPG_ERR_TOO_LARGE);
tag <<= 7; tag <<= 7;
if (!length) if (!length)
return gpg_error (GPG_ERR_EOF); return gpg_error (GPG_ERR_EOF);
@ -190,16 +184,11 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
unsigned long len = 0; unsigned long len = 0;
int count = c & 0x7f; int count = c & 0x7f;
if (count > sizeof (len) || count > sizeof (size_t))
return gpg_error (GPG_ERR_BAD_BER);
for (; count; count--) for (; count; count--)
{ {
/* Simple check against overflow. We limit our maximim
length more than needed but that should not be a problem
because I have never encountered such large value and
well they are managed in memory and thus we would run
into memory problems anyway. We assume at least 32 bit
integers. */
if (len > (1 << 24))
return gpg_error (GPG_ERR_TOO_LARGE);
len <<= 8; len <<= 8;
if (!length) if (!length)
return gpg_error (GPG_ERR_EOF); return gpg_error (GPG_ERR_EOF);