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

Fixed forward use of swapUint32Array().

Browse Source
This commit is contained in:
Vincent Richard 2005-02-05 09:26:25 +00:00
parent 1e393f0f0f
commit 2d02c629a9
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,11 @@
VERSION 0.6.4cvs VERSION 0.6.4cvs
================ ================
2005-02-05 Vincent Richard <vincent@vincent-richard.net>
* utility/md5.cpp: fixed forward use of swapUint32Array() with
gcc 3.3 (Apple).
2005-02-01 Vincent Richard <vincent@vincent-richard.net> 2005-02-01 Vincent Richard <vincent@vincent-richard.net>
* text.cpp: fixed possible segfault when encoding is Base64 (typo). * text.cpp: fixed possible segfault when encoding is Base64 (typo).

42
src/utility/md5.cpp
View File

@ -100,6 +100,27 @@ static void copyUint8Array(vmime_uint8* dest, const vmime_uint8* src, unsigned l
} }
static inline vmime_uint32 swapUint32(const vmime_uint32 D)
{
return ((D << 24) | ((D << 8) & 0x00FF0000) | ((D >> 8) & 0x0000FF00) | (D >> 24));
}
static inline void swapUint32Array(vmime_uint32* buf, unsigned long words)
{
for ( ; words >= 4 ; words -= 4, buf += 4)
{
buf[0] = swapUint32(buf[0]);
buf[1] = swapUint32(buf[1]);
buf[2] = swapUint32(buf[2]);
buf[3] = swapUint32(buf[3]);
}
for ( ; words ; --words, ++buf)
buf[0] = swapUint32(buf[0]);
}
void md5::update(const string& in) void md5::update(const string& in)
{ {
update(reinterpret_cast <const vmime_uint8*>(in.c_str()), in.length()); update(reinterpret_cast <const vmime_uint8*>(in.c_str()), in.length());
@ -176,27 +197,6 @@ void md5::finalize()
} }
static inline vmime_uint32 swapUint32(const vmime_uint32 D)
{
return ((D << 24) | ((D << 8) & 0x00FF0000) | ((D >> 8) & 0x0000FF00) | (D >> 24));
}
static inline void swapUint32Array(vmime_uint32* buf, unsigned long words)
{
for ( ; words >= 4 ; words -= 4, buf += 4)
{
buf[0] = swapUint32(buf[0]);
buf[1] = swapUint32(buf[1]);
buf[2] = swapUint32(buf[2]);
buf[3] = swapUint32(buf[3]);
}
for ( ; words ; --words, ++buf)
buf[0] = swapUint32(buf[0]);
}
void md5::transformHelper() void md5::transformHelper()
{ {
#if VMIME_BYTE_ORDER_BIG_ENDIAN #if VMIME_BYTE_ORDER_BIG_ENDIAN