mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
57af33d9e7
* include/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.
--
This fixes sign extension on shift problems. Hanno Böck found a case
with an invalid read due to this problem. To fix that almost all uses
of "<< 24" and "<< 8" are changed by this patch to use an inline
function from host2net.h.
(back ported from commit 2183683bd6)
Signed-off-by: Werner Koch <wk@gnupg.org>
[dkg: rebased to STABLE-BRANCH-1-4]
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
103 lines
2.4 KiB
C
103 lines
2.4 KiB
C
/* host2net.h - Endian conversion macros
|
|
* Copyright (C) 1998, 2014, 2015 Werner Koch
|
|
*
|
|
* This file is part of GNUPG.
|
|
*
|
|
* GNUPG is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GNUPG is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef GNUPG_COMMON_HOST2NET_H
|
|
#define GNUPG_COMMON_HOST2NET_H
|
|
|
|
#include "types.h"
|
|
|
|
#define ulongtobuf( p, a ) do { \
|
|
((byte*)p)[0] = a >> 24; \
|
|
((byte*)p)[1] = a >> 16; \
|
|
((byte*)p)[2] = a >> 8; \
|
|
((byte*)p)[3] = a ; \
|
|
} while(0)
|
|
#define ushorttobuf( p, a ) do { \
|
|
((byte*)p)[0] = a >> 8; \
|
|
((byte*)p)[1] = a ; \
|
|
} while(0)
|
|
|
|
|
|
static inline unsigned long
|
|
buf16_to_ulong (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((unsigned long)p[0] << 8) | p[1]);
|
|
}
|
|
|
|
static inline unsigned int
|
|
buf16_to_uint (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((unsigned int)p[0] << 8) | p[1]);
|
|
}
|
|
|
|
static inline unsigned short
|
|
buf16_to_ushort (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((unsigned short)p[0] << 8) | p[1]);
|
|
}
|
|
|
|
static inline u16
|
|
buf16_to_u16 (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((u16)p[0] << 8) | p[1]);
|
|
}
|
|
|
|
static inline size_t
|
|
buf32_to_size_t (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((size_t)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
}
|
|
|
|
static inline unsigned long
|
|
buf32_to_ulong (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((unsigned long)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
}
|
|
|
|
static inline unsigned int
|
|
buf32_to_uint (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((unsigned int)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
}
|
|
|
|
static inline u32
|
|
buf32_to_u32 (const void *buffer)
|
|
{
|
|
const unsigned char *p = buffer;
|
|
|
|
return (((u32)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
|
|
}
|
|
|
|
|
|
#endif /*GNUPG_COMMON_HOST2NET_H*/
|