security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Use inline functions to convert buffer data to scalars.

Browse source 
* common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
(buf16_to_ushort, buf16_to_u16): New.
(buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
--

Commit 91b826a388 was not enough to
avoid all sign extension on shift problems.  Hanno Böck found a case
with an invalid read due to this problem.  To fix that once and for
all almost all uses of "<< 24" and "<< 8" are changed by this patch to
use an inline function from host2net.h.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-02-11 10:27:57 +01:00
parent f0f71a721c
commit 2183683bd6
31 changed files with 220 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/pka.c
View file

@ -51,6 +51,7 @@
#endif
#include "util.h"
#include "host2net.h"
#include "pka.h"
#ifdef USE_DNS_PKA
@ -252,13 +253,14 @@ get_pka_info (const char *address, unsigned char *fpr)
if (p >= pend - 10)
return NULL; /* RR too short. */
type = *p++ << 8;
type |= *p++;
class = *p++ << 8;
class |= *p++;
type = buf16_to_uint (p);
p += 2;
class = buf16_to_uint (p);
p += 2;
p += 4;
txtlen = *p++ << 8;
txtlen |= *p++;
txtlen = buf16_to_uint (p);
p += 2;
if (type != T_TXT || class != C_IN)
return NULL; /* Answer does not match the query. */