GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-09-28 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* conversion.c (_gpgme_hextobyte): Prevent superfluous
	multiplication with base.  Reported by St�phane Corth�sy.

	* keylist.c (gpgme_op_keylist_ext_start): Use private asynchronous
	operation type in invocation of _gpgme_op_reset.
This commit is contained in:
Marcus Brinkmann 2002-09-28 20:08:01 +00:00
parent 21382e2d53
commit 056bb3b587
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gpgme/ChangeLog
View File

@ -1,3 +1,11 @@
2002-09-28 Marcus Brinkmann <marcus@g10code.de>
* conversion.c (_gpgme_hextobyte): Prevent superfluous
multiplication with base. Reported by Stéphane Corthésy.
* keylist.c (gpgme_op_keylist_ext_start): Use private asynchronous
operation type in invocation of _gpgme_op_reset.
2002-09-20 Werner Koch <wk@gnupg.org> 2002-09-20 Werner Koch <wk@gnupg.org>
* ath.c: Include sys/time.h if sys/select.h is not available. * ath.c: Include sys/time.h if sys/select.h is not available.

7
gpgme/conversion.c
View File

@ -23,6 +23,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <string.h>
#include <ctype.h> #include <ctype.h>
#include "gpgme.h" #include "gpgme.h"
#include "util.h" #include "util.h"
@ -34,7 +35,8 @@ _gpgme_hextobyte (const byte *str)
int val = 0; int val = 0;
int i; int i;
for (i = 0; i < 2; i++) #define NROFHEXDIGITS 2
for (i = 0; i < NROFHEXDIGITS; i++)
{ {
if (*str >= '0' && *str <= '9') if (*str >= '0' && *str <= '9')
val += *str - '0'; val += *str - '0';
@ -44,7 +46,8 @@ _gpgme_hextobyte (const byte *str)
val += 10 + *str - 'a'; val += 10 + *str - 'a';
else else
return -1; return -1;
val *= 16; if (i < NROFHEXDIGITS - 1)
val *= 16;
str++; str++;
} }
return val; return val;

4
gpgme/keylist.c
View File

@ -633,9 +633,7 @@ gpgme_op_keylist_ext_start (GpgmeCtx ctx, const char *pattern[],
{ {
GpgmeError err = 0; GpgmeError err = 0;
/* Keylist operations are always "synchronous" in the sense that we err = _gpgme_op_reset (ctx, 2);
don't add ourself to the global FD table. */
err = _gpgme_op_reset (ctx, 1);
if (err) if (err)
goto leave; goto leave;