sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

CVE-2022-42898 source4/heimdal: Add bswap64()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15203

[jsutton@samba.org backported from Heimdal commit
 0271b171e5331f0f562319b887f5f0b058ecc9b4; removed changes to
 cf/roken-frag.m4 that we don't have]
This commit is contained in:
Nicolas Williams 2015-05-21 14:05:31 -05:00 committed by Jule Anger
parent 1e55754752
commit 8369aee33a
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/heimdal/lib/roken/bswap.c
View File

@ -34,6 +34,23 @@
#include <config.h>
#include "roken.h"
#ifndef HAVE_BSWAP64
ROKEN_LIB_FUNCTION uint64_t ROKEN_LIB_CALL
bswap64 (uint64_t val)
{
return
(val & 0xffULL) << 56 |
(val & 0xff00ULL) << 40 |
(val & 0xff0000ULL) << 24 |
(val & 0xff000000ULL) << 8 |
(val & 0xff00000000ULL) >> 8 |
(val & 0xff0000000000ULL) >> 24 |
(val & 0xff000000000000ULL) >> 40 |
(val & 0xff00000000000000ULL) >> 56 ;
}
#endif
#ifndef HAVE_BSWAP32
ROKEN_LIB_FUNCTION unsigned int ROKEN_LIB_CALL

5
source4/heimdal/lib/roken/roken.h.in
View File

@ -696,6 +696,11 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL pidfile (const char*);
#endif
#endif
#ifndef HAVE_BSWAP64
#define bswap64 rk_bswap64
ROKEN_LIB_FUNCTION uint64_t ROKEN_LIB_CALL bswap64(uint64_t);
#endif
#ifndef HAVE_BSWAP32
#define bswap32 rk_bswap32
ROKEN_LIB_FUNCTION unsigned int ROKEN_LIB_CALL bswap32(unsigned int);

1
source4/heimdal/lib/roken/version-script.map
View File

@ -38,6 +38,7 @@ HEIMDAL_ROKEN_1.0 {
rk_asprintf;
rk_bswap16;
rk_bswap32;
rk_bswap64;
rk_cgetent;
rk_cgetstr;
rk_cloexec;