From 60a3bc903460476cffc6888e9f2e6345159d032e Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 21 Aug 2009 20:15:17 +0000 Subject: (svn r17247) -Change: move '3rd party' MD5 implementation also to the 3rdparty directory. --- projects/openttd_vs80.vcproj | 20 ++- projects/openttd_vs90.vcproj | 20 ++- readme.txt | 1 + source.list | 6 +- src/3rdparty/md5/md5.cpp | 323 +++++++++++++++++++++++++++++++++++++++++ src/3rdparty/md5/md5.h | 82 +++++++++++ src/ai/ai_scanner.cpp | 2 +- src/fios.cpp | 2 +- src/gfxinit.cpp | 2 +- src/md5.cpp | 323 ----------------------------------------- src/md5.h | 82 ----------- src/misc_gui.cpp | 1 + src/network/network.cpp | 2 +- src/network/network_client.cpp | 2 +- src/newgrf_config.cpp | 2 +- 15 files changed, 441 insertions(+), 429 deletions(-) create mode 100644 src/3rdparty/md5/md5.cpp create mode 100644 src/3rdparty/md5/md5.h delete mode 100644 src/md5.cpp delete mode 100644 src/md5.h diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 6590524cd..a42c1db8a 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -595,10 +595,6 @@ RelativePath=".\..\src\map.cpp" > - - @@ -1115,10 +1111,6 @@ RelativePath=".\..\src\map_type.h" > - - @@ -2328,6 +2320,18 @@ > + + + + + + diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 5433539e5..cd2d44590 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -592,10 +592,6 @@ RelativePath=".\..\src\map.cpp" > - - @@ -1112,10 +1108,6 @@ RelativePath=".\..\src\map_type.h" > - - @@ -2325,6 +2317,18 @@ > + + + + + + diff --git a/readme.txt b/readme.txt index 9c514c056..e040dbc1a 100644 --- a/readme.txt +++ b/readme.txt @@ -502,6 +502,7 @@ Thanks to: Richard Kempton (RichK67) - Additional airports, initial TGP implementation Alberto Demichelis - Squirrel scripting language Markus F.X.J. Oberhumer - MiniLZO for loading old savegames + L. Peter Deutsch - MD5 implementation Michael Blunck - For revolutionizing TTD with awesome graphics George - Canal graphics David Dallaston (Pikka) - Tram tracks diff --git a/source.list b/source.list index f2e1d964e..87cd51c2d 100644 --- a/source.list +++ b/source.list @@ -34,7 +34,6 @@ highscore.cpp ini.cpp landscape.cpp map.cpp -md5.cpp misc.cpp mixer.cpp music.cpp @@ -207,7 +206,6 @@ landscape_type.h livery.h map_func.h map_type.h -md5.h mixer.h music.h namegen_func.h @@ -531,6 +529,10 @@ table/unicode.h table/unmovable_land.h table/water_land.h +# MD5 +3rdparty/md5/md5.cpp +3rdparty/md5/md5.h + # MiniLZO 3rdparty/minilzo/lzoconf.h 3rdparty/minilzo/lzodefs.h diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp new file mode 100644 index 000000000..00e31b845 --- /dev/null +++ b/src/3rdparty/md5/md5.cpp @@ -0,0 +1,323 @@ +/* $Id$ */ + +/** @file md5.cpp Creating MD5 checksums of files. */ + +/* + Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ + +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321, whose + text is available at + http://www.ietf.org/rfc/rfc1321.txt + The code is derived from the text of the RFC, including the test suite + (section A.5) but excluding the rest of Appendix A. It does not include + any code or documentation that is identified in the RFC as being + copyrighted. + + The original and principal author of md5.c is L. Peter Deutsch + . Other authors are noted in the change history + that follows (in reverse chronological order): + + 2007-12-24 Changed to C++ and adapted to OpenTTD source + 2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order + either statically or dynamically; added missing #include + in library. + 2002-03-11 lpd Corrected argument list for main(), and added int return + type, in test program and T value program. + 2002-02-21 lpd Added missing #include in test program. + 2000-07-03 lpd Patched to eliminate warnings about "constant is + unsigned in ANSI C, signed in traditional"; made test program + self-checking. + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). + 1999-05-03 lpd Original version. + */ + +#include "../../stdafx.h" +#include "../../core/bitmath_func.hpp" +#include "../../core/endian_func.hpp" +#include "md5.h" + +#define T_MASK ((uint32)~0) +#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87) +#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9) +#define T3 0x242070db +#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111) +#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050) +#define T6 0x4787c62a +#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec) +#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe) +#define T9 0x698098d8 +#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850) +#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e) +#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841) +#define T13 0x6b901122 +#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c) +#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71) +#define T16 0x49b40821 +#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d) +#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf) +#define T19 0x265e5a51 +#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855) +#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2) +#define T22 0x02441453 +#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e) +#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437) +#define T25 0x21e1cde6 +#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829) +#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278) +#define T28 0x455a14ed +#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa) +#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07) +#define T31 0x676f02d9 +#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375) +#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd) +#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e) +#define T35 0x6d9d6122 +#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3) +#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb) +#define T38 0x4bdecfa9 +#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f) +#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f) +#define T41 0x289b7ec6 +#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805) +#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a) +#define T44 0x04881d05 +#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6) +#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a) +#define T47 0x1fa27cf8 +#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a) +#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb) +#define T50 0x432aff97 +#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58) +#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6) +#define T53 0x655b59c3 +#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d) +#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82) +#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e) +#define T57 0x6fa87e4f +#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f) +#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb) +#define T60 0x4e0811a1 +#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d) +#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca) +#define T63 0x2ad7d2bb +#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) + +static inline void Md5Set1(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) +{ + uint32 t = (*b & *c) | (~*b & *d); + t += *a + X[k] + Ti; + *a = ROL(t, s) + *b; +} + +static inline void Md5Set2(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) +{ + uint32 t = (*b & *d) | (*c & ~*d); + t += *a + X[k] + Ti; + *a = ROL(t, s) + *b; +} + + +static inline void Md5Set3(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) +{ + uint32 t = *b ^ *c ^ *d; + t += *a + X[k] + Ti; + *a = ROL(t, s) + *b; +} + +static inline void Md5Set4(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) +{ + uint32 t = *c ^ (*b | ~*d); + t += *a + X[k] + Ti; + *a = ROL(t, s) + *b; +} + +Md5::Md5() +{ + count[0] = 0; + count[1] = 0; + abcd[0] = 0x67452301; + abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476; + abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301; + abcd[3] = 0x10325476; +} + +void Md5::Process(const uint8 *data /*[64]*/) +{ + uint32 a = this->abcd[0]; + uint32 b = this->abcd[1]; + uint32 c = this->abcd[2]; + uint32 d = this->abcd[3]; + + uint32 X[16]; + + /* Convert the uint8 data to uint32 LE */ + uint32 *px = (uint32 *)data; + for (uint i = 0; i < 16; i++) { + X[i] = TO_LE32(*px); + px++; + } + + /* Round 1. */ + Md5Set1(X, &a, &b, &c, &d, 0, 7, T1); + Md5Set1(X, &d, &a, &b, &c, 1, 12, T2); + Md5Set1(X, &c, &d, &a, &b, 2, 17, T3); + Md5Set1(X, &b, &c, &d, &a, 3, 22, T4); + Md5Set1(X, &a, &b, &c, &d, 4, 7, T5); + Md5Set1(X, &d, &a, &b, &c, 5, 12, T6); + Md5Set1(X, &c, &d, &a, &b, 6, 17, T7); + Md5Set1(X, &b, &c, &d, &a, 7, 22, T8); + Md5Set1(X, &a, &b, &c, &d, 8, 7, T9); + Md5Set1(X, &d, &a, &b, &c, 9, 12, T10); + Md5Set1(X, &c, &d, &a, &b, 10, 17, T11); + Md5Set1(X, &b, &c, &d, &a, 11, 22, T12); + Md5Set1(X, &a, &b, &c, &d, 12, 7, T13); + Md5Set1(X, &d, &a, &b, &c, 13, 12, T14); + Md5Set1(X, &c, &d, &a, &b, 14, 17, T15); + Md5Set1(X, &b, &c, &d, &a, 15, 22, T16); + + /* Round 2. */ + Md5Set2(X, &a, &b, &c, &d, 1, 5, T17); + Md5Set2(X, &d, &a, &b, &c, 6, 9, T18); + Md5Set2(X, &c, &d, &a, &b, 11, 14, T19); + Md5Set2(X, &b, &c, &d, &a, 0, 20, T20); + Md5Set2(X, &a, &b, &c, &d, 5, 5, T21); + Md5Set2(X, &d, &a, &b, &c, 10, 9, T22); + Md5Set2(X, &c, &d, &a, &b, 15, 14, T23); + Md5Set2(X, &b, &c, &d, &a, 4, 20, T24); + Md5Set2(X, &a, &b, &c, &d, 9, 5, T25); + Md5Set2(X, &d, &a, &b, &c, 14, 9, T26); + Md5Set2(X, &c, &d, &a, &b, 3, 14, T27); + Md5Set2(X, &b, &c, &d, &a, 8, 20, T28); + Md5Set2(X, &a, &b, &c, &d, 13, 5, T29); + Md5Set2(X, &d, &a, &b, &c, 2, 9, T30); + Md5Set2(X, &c, &d, &a, &b, 7, 14, T31); + Md5Set2(X, &b, &c, &d, &a, 12, 20, T32); + + /* Round 3. */ + Md5Set3(X, &a, &b, &c, &d, 5, 4, T33); + Md5Set3(X, &d, &a, &b, &c, 8, 11, T34); + Md5Set3(X, &c, &d, &a, &b, 11, 16, T35); + Md5Set3(X, &b, &c, &d, &a, 14, 23, T36); + Md5Set3(X, &a, &b, &c, &d, 1, 4, T37); + Md5Set3(X, &d, &a, &b, &c, 4, 11, T38); + Md5Set3(X, &c, &d, &a, &b, 7, 16, T39); + Md5Set3(X, &b, &c, &d, &a, 10, 23, T40); + Md5Set3(X, &a, &b, &c, &d, 13, 4, T41); + Md5Set3(X, &d, &a, &b, &c, 0, 11, T42); + Md5Set3(X, &c, &d, &a, &b, 3, 16, T43); + Md5Set3(X, &b, &c, &d, &a, 6, 23, T44); + Md5Set3(X, &a, &b, &c, &d, 9, 4, T45); + Md5Set3(X, &d, &a, &b, &c, 12, 11, T46); + Md5Set3(X, &c, &d, &a, &b, 15, 16, T47); + Md5Set3(X, &b, &c, &d, &a, 2, 23, T48); + + /* Round 4. */ + Md5Set4(X, &a, &b, &c, &d, 0, 6, T49); + Md5Set4(X, &d, &a, &b, &c, 7, 10, T50); + Md5Set4(X, &c, &d, &a, &b, 14, 15, T51); + Md5Set4(X, &b, &c, &d, &a, 5, 21, T52); + Md5Set4(X, &a, &b, &c, &d, 12, 6, T53); + Md5Set4(X, &d, &a, &b, &c, 3, 10, T54); + Md5Set4(X, &c, &d, &a, &b, 10, 15, T55); + Md5Set4(X, &b, &c, &d, &a, 1, 21, T56); + Md5Set4(X, &a, &b, &c, &d, 8, 6, T57); + Md5Set4(X, &d, &a, &b, &c, 15, 10, T58); + Md5Set4(X, &c, &d, &a, &b, 6, 15, T59); + Md5Set4(X, &b, &c, &d, &a, 13, 21, T60); + Md5Set4(X, &a, &b, &c, &d, 4, 6, T61); + Md5Set4(X, &d, &a, &b, &c, 11, 10, T62); + Md5Set4(X, &c, &d, &a, &b, 2, 15, T63); + Md5Set4(X, &b, &c, &d, &a, 9, 21, T64); + + /* Then perform the following additions. (That is increment each + * of the four registers by the value it had before this block + * was started.) */ + this->abcd[0] += a; + this->abcd[1] += b; + this->abcd[2] += c; + this->abcd[3] += d; +} + +void Md5::Append(const void *data, const size_t nbytes) +{ + const uint8 *p = (const uint8 *)data; + size_t left = nbytes; + const size_t offset = (this->count[0] >> 3) & 63; + const uint32 nbits = (uint32)(nbytes << 3); + + if (nbytes <= 0) return; + + /* Update the message length. */ + this->count[1] += (uint32)(nbytes >> 29); + this->count[0] += nbits; + + if (this->count[0] < nbits) this->count[1]++; + + /* Process an initial partial block. */ + if (offset) { + size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes); + + memcpy(this->buf + offset, p, copy); + + if (offset + copy < 64) return; + + p += copy; + left -= copy; + this->Process(this->buf); + } + + /* Process full blocks. */ + for (; left >= 64; p += 64, left -= 64) this->Process(p); + + /* Process a final partial block. */ + if (left) memcpy(this->buf, p, left); +} + +void Md5::Finish(uint8 digest[16]) +{ + static const uint8 pad[64] = { + 0x80, 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, 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]; + uint i; + + /* Save the length before padding. */ + for (i = 0; i < 8; ++i) + data[i] = (uint8)(this->count[i >> 2] >> ((i & 3) << 3)); + + /* Pad to 56 bytes mod 64. */ + this->Append(pad, ((55 - (this->count[0] >> 3)) & 63) + 1); + /* Append the length. */ + this->Append(data, 8); + + for (i = 0; i < 16; ++i) + digest[i] = (uint8)(this->abcd[i >> 2] >> ((i & 3) << 3)); +} diff --git a/src/3rdparty/md5/md5.h b/src/3rdparty/md5/md5.h new file mode 100644 index 000000000..a3c4a6d9f --- /dev/null +++ b/src/3rdparty/md5/md5.h @@ -0,0 +1,82 @@ +/* $Id$ */ + +/** @file md5.h Functions to create MD5 checksums. */ + +/* + Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ + +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321, whose + text is available at + http://www.ietf.org/rfc/rfc1321.txt + The code is derived from the text of the RFC, including the test suite + (section A.5) but excluding the rest of Appendix A. It does not include + any code or documentation that is identified in the RFC as being + copyrighted. + + The original and principal author of md5.h is L. Peter Deutsch + . Other authors are noted in the change history + that follows (in reverse chronological order): + + 2007-12-24 Changed to C++ and adapted to OpenTTD source + 2002-04-13 lpd Removed support for non-ANSI compilers; removed + references to Ghostscript; clarified derivation from RFC 1321; + now handles byte order either statically or dynamically. + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); + added conditionalization for C++ compilation from Martin + Purschke . + 1999-05-03 lpd Original version. + */ + +#ifndef 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 { +private: + uint32 count[2]; ///< message length in bits, lsw first + uint32 abcd[4]; ///< digest buffer + uint8 buf[64]; ///< accumulate block + + void Process(const uint8 *data); + +public: + Md5(); + void Append(const void *data, const size_t nbytes); + void Finish(uint8 digest[16]); +}; + +#endif /* MD5_INCLUDED */ diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp index 64008d539..d0bd1d5c1 100644 --- a/src/ai/ai_scanner.cpp +++ b/src/ai/ai_scanner.cpp @@ -334,7 +334,7 @@ char *AIScanner::GetAIConsoleList(char *p, const char *last) #if defined(ENABLE_NETWORK) #include "../network/network_content.h" -#include "../md5.h" +#include "../3rdparty/md5/md5.h" #include "../tar_type.h" /** Helper for creating a MD5sum of all files within of an AI. */ diff --git a/src/fios.cpp b/src/fios.cpp index bee76a1d6..7328e884b 100644 --- a/src/fios.cpp +++ b/src/fios.cpp @@ -523,7 +523,7 @@ void FiosGetHeightmapList(SaveLoadDialogMode mode) #if defined(ENABLE_NETWORK) #include "core/smallvec_type.hpp" #include "network/network_content.h" -#include "md5.h" +#include "3rdparty/md5/md5.h" /** Basic data to distinguish a scenario. Used in the server list window */ struct ScenarioIdentifier { diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 1f8bf089f..32ed06386 100644 --- a/src/gfxinit.cpp +++ b/src/gfxinit.cpp @@ -8,7 +8,7 @@ #include "fileio_func.h" #include "fios.h" #include "newgrf.h" -#include "md5.h" +#include "3rdparty/md5/md5.h" #include "fontcache.h" #include "gfx_func.h" #include "settings_type.h" diff --git a/src/md5.cpp b/src/md5.cpp deleted file mode 100644 index 6e8580fa7..000000000 --- a/src/md5.cpp +++ /dev/null @@ -1,323 +0,0 @@ -/* $Id$ */ - -/** @file md5.cpp Creating MD5 checksums of files. */ - -/* - Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - L. Peter Deutsch - ghost@aladdin.com - - */ - -/* - Independent implementation of MD5 (RFC 1321). - - This code implements the MD5 Algorithm defined in RFC 1321, whose - text is available at - http://www.ietf.org/rfc/rfc1321.txt - The code is derived from the text of the RFC, including the test suite - (section A.5) but excluding the rest of Appendix A. It does not include - any code or documentation that is identified in the RFC as being - copyrighted. - - The original and principal author of md5.c is L. Peter Deutsch - . Other authors are noted in the change history - that follows (in reverse chronological order): - - 2007-12-24 Changed to C++ and adapted to OpenTTD source - 2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order - either statically or dynamically; added missing #include - in library. - 2002-03-11 lpd Corrected argument list for main(), and added int return - type, in test program and T value program. - 2002-02-21 lpd Added missing #include in test program. - 2000-07-03 lpd Patched to eliminate warnings about "constant is - unsigned in ANSI C, signed in traditional"; made test program - self-checking. - 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. - 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5). - 1999-05-03 lpd Original version. - */ - -#include "stdafx.h" -#include "core/bitmath_func.hpp" -#include "core/endian_func.hpp" -#include "md5.h" - -#define T_MASK ((uint32)~0) -#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87) -#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9) -#define T3 0x242070db -#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111) -#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050) -#define T6 0x4787c62a -#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec) -#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe) -#define T9 0x698098d8 -#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850) -#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e) -#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841) -#define T13 0x6b901122 -#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c) -#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71) -#define T16 0x49b40821 -#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d) -#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf) -#define T19 0x265e5a51 -#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855) -#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2) -#define T22 0x02441453 -#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e) -#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437) -#define T25 0x21e1cde6 -#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829) -#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278) -#define T28 0x455a14ed -#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa) -#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07) -#define T31 0x676f02d9 -#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375) -#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd) -#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e) -#define T35 0x6d9d6122 -#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3) -#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb) -#define T38 0x4bdecfa9 -#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f) -#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f) -#define T41 0x289b7ec6 -#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805) -#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a) -#define T44 0x04881d05 -#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6) -#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a) -#define T47 0x1fa27cf8 -#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a) -#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb) -#define T50 0x432aff97 -#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58) -#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6) -#define T53 0x655b59c3 -#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d) -#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82) -#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e) -#define T57 0x6fa87e4f -#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f) -#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb) -#define T60 0x4e0811a1 -#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d) -#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca) -#define T63 0x2ad7d2bb -#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e) - -static inline void Md5Set1(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) -{ - uint32 t = (*b & *c) | (~*b & *d); - t += *a + X[k] + Ti; - *a = ROL(t, s) + *b; -} - -static inline void Md5Set2(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) -{ - uint32 t = (*b & *d) | (*c & ~*d); - t += *a + X[k] + Ti; - *a = ROL(t, s) + *b; -} - - -static inline void Md5Set3(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) -{ - uint32 t = *b ^ *c ^ *d; - t += *a + X[k] + Ti; - *a = ROL(t, s) + *b; -} - -static inline void Md5Set4(const uint32 *X, uint32 *a, const uint32 *b, const uint32 *c, const uint32 *d, const uint8 k, const uint8 s, const uint32 Ti) -{ - uint32 t = *c ^ (*b | ~*d); - t += *a + X[k] + Ti; - *a = ROL(t, s) + *b; -} - -Md5::Md5() -{ - count[0] = 0; - count[1] = 0; - abcd[0] = 0x67452301; - abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476; - abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301; - abcd[3] = 0x10325476; -} - -void Md5::Process(const uint8 *data /*[64]*/) -{ - uint32 a = this->abcd[0]; - uint32 b = this->abcd[1]; - uint32 c = this->abcd[2]; - uint32 d = this->abcd[3]; - - uint32 X[16]; - - /* Convert the uint8 data to uint32 LE */ - uint32 *px = (uint32 *)data; - for (uint i = 0; i < 16; i++) { - X[i] = TO_LE32(*px); - px++; - } - - /* Round 1. */ - Md5Set1(X, &a, &b, &c, &d, 0, 7, T1); - Md5Set1(X, &d, &a, &b, &c, 1, 12, T2); - Md5Set1(X, &c, &d, &a, &b, 2, 17, T3); - Md5Set1(X, &b, &c, &d, &a, 3, 22, T4); - Md5Set1(X, &a, &b, &c, &d, 4, 7, T5); - Md5Set1(X, &d, &a, &b, &c, 5, 12, T6); - Md5Set1(X, &c, &d, &a, &b, 6, 17, T7); - Md5Set1(X, &b, &c, &d, &a, 7, 22, T8); - Md5Set1(X, &a, &b, &c, &d, 8, 7, T9); - Md5Set1(X, &d, &a, &b, &c, 9, 12, T10); - Md5Set1(X, &c, &d, &a, &b, 10, 17, T11); - Md5Set1(X, &b, &c, &d, &a, 11, 22, T12); - Md5Set1(X, &a, &b, &c, &d, 12, 7, T13); - Md5Set1(X, &d, &a, &b, &c, 13, 12, T14); - Md5Set1(X, &c, &d, &a, &b, 14, 17, T15); - Md5Set1(X, &b, &c, &d, &a, 15, 22, T16); - - /* Round 2. */ - Md5Set2(X, &a, &b, &c, &d, 1, 5, T17); - Md5Set2(X, &d, &a, &b, &c, 6, 9, T18); - Md5Set2(X, &c, &d, &a, &b, 11, 14, T19); - Md5Set2(X, &b, &c, &d, &a, 0, 20, T20); - Md5Set2(X, &a, &b, &c, &d, 5, 5, T21); - Md5Set2(X, &d, &a, &b, &c, 10, 9, T22); - Md5Set2(X, &c, &d, &a, &b, 15, 14, T23); - Md5Set2(X, &b, &c, &d, &a, 4, 20, T24); - Md5Set2(X, &a, &b, &c, &d, 9, 5, T25); - Md5Set2(X, &d, &a, &b, &c, 14, 9, T26); - Md5Set2(X, &c, &d, &a, &b, 3, 14, T27); - Md5Set2(X, &b, &c, &d, &a, 8, 20, T28); - Md5Set2(X, &a, &b, &c, &d, 13, 5, T29); - Md5Set2(X, &d, &a, &b, &c, 2, 9, T30); - Md5Set2(X, &c, &d, &a, &b, 7, 14, T31); - Md5Set2(X, &b, &c, &d, &a, 12, 20, T32); - - /* Round 3. */ - Md5Set3(X, &a, &b, &c, &d, 5, 4, T33); - Md5Set3(X, &d, &a, &b, &c, 8, 11, T34); - Md5Set3(X, &c, &d, &a, &b, 11, 16, T35); - Md5Set3(X, &b, &c, &d, &a, 14, 23, T36); - Md5Set3(X, &a, &b, &c, &d, 1, 4, T37); - Md5Set3(X, &d, &a, &b, &c, 4, 11, T38); - Md5Set3(X, &c, &d, &a, &b, 7, 16, T39); - Md5Set3(X, &b, &c, &d, &a, 10, 23, T40); - Md5Set3(X, &a, &b, &c, &d, 13, 4, T41); - Md5Set3(X, &d, &a, &b, &c, 0, 11, T42); - Md5Set3(X, &c, &d, &a, &b, 3, 16, T43); - Md5Set3(X, &b, &c, &d, &a, 6, 23, T44); - Md5Set3(X, &a, &b, &c, &d, 9, 4, T45); - Md5Set3(X, &d, &a, &b, &c, 12, 11, T46); - Md5Set3(X, &c, &d, &a, &b, 15, 16, T47); - Md5Set3(X, &b, &c, &d, &a, 2, 23, T48); - - /* Round 4. */ - Md5Set4(X, &a, &b, &c, &d, 0, 6, T49); - Md5Set4(X, &d, &a, &b, &c, 7, 10, T50); - Md5Set4(X, &c, &d, &a, &b, 14, 15, T51); - Md5Set4(X, &b, &c, &d, &a, 5, 21, T52); - Md5Set4(X, &a, &b, &c, &d, 12, 6, T53); - Md5Set4(X, &d, &a, &b, &c, 3, 10, T54); - Md5Set4(X, &c, &d, &a, &b, 10, 15, T55); - Md5Set4(X, &b, &c, &d, &a, 1, 21, T56); - Md5Set4(X, &a, &b, &c, &d, 8, 6, T57); - Md5Set4(X, &d, &a, &b, &c, 15, 10, T58); - Md5Set4(X, &c, &d, &a, &b, 6, 15, T59); - Md5Set4(X, &b, &c, &d, &a, 13, 21, T60); - Md5Set4(X, &a, &b, &c, &d, 4, 6, T61); - Md5Set4(X, &d, &a, &b, &c, 11, 10, T62); - Md5Set4(X, &c, &d, &a, &b, 2, 15, T63); - Md5Set4(X, &b, &c, &d, &a, 9, 21, T64); - - /* Then perform the following additions. (That is increment each - * of the four registers by the value it had before this block - * was started.) */ - this->abcd[0] += a; - this->abcd[1] += b; - this->abcd[2] += c; - this->abcd[3] += d; -} - -void Md5::Append(const void *data, const size_t nbytes) -{ - const uint8 *p = (const uint8 *)data; - size_t left = nbytes; - const size_t offset = (this->count[0] >> 3) & 63; - const uint32 nbits = (uint32)(nbytes << 3); - - if (nbytes <= 0) return; - - /* Update the message length. */ - this->count[1] += (uint32)(nbytes >> 29); - this->count[0] += nbits; - - if (this->count[0] < nbits) this->count[1]++; - - /* Process an initial partial block. */ - if (offset) { - size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes); - - memcpy(this->buf + offset, p, copy); - - if (offset + copy < 64) return; - - p += copy; - left -= copy; - this->Process(this->buf); - } - - /* Process full blocks. */ - for (; left >= 64; p += 64, left -= 64) this->Process(p); - - /* Process a final partial block. */ - if (left) memcpy(this->buf, p, left); -} - -void Md5::Finish(uint8 digest[16]) -{ - static const uint8 pad[64] = { - 0x80, 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, 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]; - uint i; - - /* Save the length before padding. */ - for (i = 0; i < 8; ++i) - data[i] = (uint8)(this->count[i >> 2] >> ((i & 3) << 3)); - - /* Pad to 56 bytes mod 64. */ - this->Append(pad, ((55 - (this->count[0] >> 3)) & 63) + 1); - /* Append the length. */ - this->Append(data, 8); - - for (i = 0; i < 16; ++i) - digest[i] = (uint8)(this->abcd[i >> 2] >> ((i & 3) << 3)); -} diff --git a/src/md5.h b/src/md5.h deleted file mode 100644 index a3c4a6d9f..000000000 --- a/src/md5.h +++ /dev/null @@ -1,82 +0,0 @@ -/* $Id$ */ - -/** @file md5.h Functions to create MD5 checksums. */ - -/* - Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - L. Peter Deutsch - ghost@aladdin.com - - */ - -/* - Independent implementation of MD5 (RFC 1321). - - This code implements the MD5 Algorithm defined in RFC 1321, whose - text is available at - http://www.ietf.org/rfc/rfc1321.txt - The code is derived from the text of the RFC, including the test suite - (section A.5) but excluding the rest of Appendix A. It does not include - any code or documentation that is identified in the RFC as being - copyrighted. - - The original and principal author of md5.h is L. Peter Deutsch - . Other authors are noted in the change history - that follows (in reverse chronological order): - - 2007-12-24 Changed to C++ and adapted to OpenTTD source - 2002-04-13 lpd Removed support for non-ANSI compilers; removed - references to Ghostscript; clarified derivation from RFC 1321; - now handles byte order either statically or dynamically. - 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. - 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); - added conditionalization for C++ compilation from Martin - Purschke . - 1999-05-03 lpd Original version. - */ - -#ifndef 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 { -private: - uint32 count[2]; ///< message length in bits, lsw first - uint32 abcd[4]; ///< digest buffer - uint8 buf[64]; ///< accumulate block - - void Process(const uint8 *data); - -public: - Md5(); - void Append(const void *data, const size_t nbytes); - void Finish(uint8 digest[16]); -}; - -#endif /* MD5_INCLUDED */ diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index c77a5e03b..9a57442a9 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -381,6 +381,7 @@ struct AboutWindow : public Window { "", " Alberto Demichelis - Squirrel scripting language © 2003-2008", " Markus F.X.J. Oberhumer - (Mini)LZO for loading old savegames © 1996-2008", + " L. Peter Deutsch - MD5 implementation © 1999, 2000, 2002", " Michael Blunck - Pre-Signals and Semaphores © 2003", " George - Canal/Lock graphics © 2003-2004", " David Dallaston - Tram tracks", diff --git a/src/network/network.cpp b/src/network/network.cpp index bbf26f74d..413075c65 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -22,7 +22,7 @@ #include "core/host.h" #include "network_gui.h" #include "../console_func.h" -#include "../md5.h" +#include "../3rdparty/md5/md5.h" #include "../core/random_func.hpp" #include "../window_func.h" #include "../string_func.h" diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 7b6e99207..1beebb866 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -14,7 +14,7 @@ #include "../command_func.h" #include "../console_func.h" #include "../fileio_func.h" -#include "../md5.h" +#include "../3rdparty/md5/md5.h" #include "../strings_func.h" #include "../window_func.h" #include "../string_func.h" diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index b752200e7..029531c1a 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "debug.h" -#include "md5.h" +#include "3rdparty/md5/md5.h" #include "newgrf.h" #include "string_func.h" #include "gamelog.h" -- cgit v1.2.3-54-g00ecf