mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17883) -Codechange: little cleaning in md5.cpp and md5.h

release/1.0
smatz 2009-10-26 23:03:03 +00:00
parent e61008b599
commit 1bc7684ff0
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/3rdparty/md5/md5.cpp vendored
View File

@ -175,7 +175,7 @@ void Md5::Process(const uint8 *data /*[64]*/)
uint32 X[16]; uint32 X[16];
/* Convert the uint8 data to uint32 LE */ /* Convert the uint8 data to uint32 LE */
uint32 *px = (uint32 *)data; const uint32 *px = (const uint32 *)data;
for (uint i = 0; i < 16; i++) { for (uint i = 0; i < 16; i++) {
X[i] = TO_LE32(*px); X[i] = TO_LE32(*px);
px++; px++;
@ -306,17 +306,18 @@ void Md5::Finish(uint8 digest[16])
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}; };
uint8 data[8]; uint8 data[8];
uint i;
/* Save the length before padding. */ /* Save the length before padding. */
for (i = 0; i < 8; ++i) for (uint i = 0; i < 8; ++i) {
data[i] = (uint8)(this->count[i >> 2] >> ((i & 3) << 3)); data[i] = (uint8)(this->count[i >> 2] >> ((i & 3) << 3));
}
/* Pad to 56 bytes mod 64. */ /* Pad to 56 bytes mod 64. */
this->Append(pad, ((55 - (this->count[0] >> 3)) & 63) + 1); this->Append(pad, ((55 - (this->count[0] >> 3)) & 63) + 1);
/* Append the length. */ /* Append the length. */
this->Append(data, 8); this->Append(data, 8);
for (i = 0; i < 16; ++i) for (uint i = 0; i < 16; ++i) {
digest[i] = (uint8)(this->abcd[i >> 2] >> ((i & 3) << 3)); digest[i] = (uint8)(this->abcd[i >> 2] >> ((i & 3) << 3));
}
} }

10
src/3rdparty/md5/md5.h vendored
View File

@ -55,16 +55,6 @@
#ifndef MD5_INCLUDED #ifndef MD5_INCLUDED
#define MD5_INCLUDED #define MD5_INCLUDED
/*
* This package supports both compile-time and run-time determination of CPU
* byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
* compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
* defined as non-zero, the code will be compiled to run only on big-endian
* CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
* run on either big- or little-endian CPUs, but will run slightly less
* efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
*/
struct Md5 { struct Md5 {
private: private:
uint32 count[2]; ///< message length in bits, lsw first uint32 count[2]; ///< message length in bits, lsw first