diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/changelog simgear-3.0.0/debian/changelog --- simgear-3.0.0~git20140204+c99ea4/debian/changelog 2014-02-08 15:16:14.000000000 +0000 +++ simgear-3.0.0/debian/changelog 2014-02-19 16:35:31.000000000 +0000 @@ -1,3 +1,16 @@ +simgear (3.0.0-1) unstable; urgency=medium + + [ Markus Wanner ] + * New upstream release. + * Drop the md5 replacement patch - applied upstream. + * Adjust watchfile to properly account for release candidates. + + [ Rebecca Palmer ] + * Replace sgstream_ignore_write_error.patch with a real fix in + sgstream_test_fix_length.patch and respect test suite results, again. + + -- Markus Wanner Wed, 19 Feb 2014 08:35:13 -0800 + simgear (3.0.0~git20140204+c99ea4-1) unstable; urgency=low [ Markus Wanner ] diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/patches/replace_md5.patch simgear-3.0.0/debian/patches/replace_md5.patch --- simgear-3.0.0~git20140204+c99ea4/debian/patches/replace_md5.patch 2014-02-08 15:14:36.000000000 +0000 +++ simgear-3.0.0/debian/patches/replace_md5.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,646 +0,0 @@ -Description: Replace license-incompatible MD5 - -Use the MD5 from dpkg (public domain) instead of the one from RSA -(GPL-incompatible due to advertising clause). - -Origin: upstream https://gitorious.org/fg/simgear/commit/4f5c51963698ef71e18bcdc235c1fd8b723e7728 -Bug-Debian: http://bugs.debian.org/737733 - -diff --git a/simgear/io/SVNReportParser.cxx b/simgear/io/SVNReportParser.cxx -index d31d327..72b6169 100644 ---- a/simgear/io/SVNReportParser.cxx -+++ b/simgear/io/SVNReportParser.cxx -@@ -377,8 +377,9 @@ public: - memset(&md5Context, 0, sizeof(SG_MD5_CTX)); - SG_MD5Init(&md5Context); - SG_MD5Update(&md5Context, (unsigned char*) output.data(), output.size()); -- SG_MD5Final(&md5Context); -- decodedFileMd5 = strutils::encodeHex(md5Context.digest, 16); -+ unsigned char digest[MD5_DIGEST_LENGTH]; -+ SG_MD5Final(digest, &md5Context); -+ decodedFileMd5 = strutils::encodeHex(digest, MD5_DIGEST_LENGTH); - - return true; - } -diff --git a/simgear/package/Install.cxx b/simgear/package/Install.cxx -index d513786..3a15981 100644 ---- a/simgear/package/Install.cxx -+++ b/simgear/package/Install.cxx -@@ -89,13 +89,14 @@ protected: - return; - } - -- SG_MD5Final(&m_md5); -+ unsigned char digest[MD5_DIGEST_LENGTH]; -+ SG_MD5Final(digest, &m_md5); - // convert final sum to hex - const char hexChar[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; - std::stringstream hexMd5; -- for (int i=0; i<16;++i) { -- hexMd5 << hexChar[m_md5.digest[i] >> 4]; -- hexMd5 << hexChar[m_md5.digest[i] & 0x0f]; -+ for (int i=0; i> 4]; -+ hexMd5 << hexChar[digest[i] & 0x0f]; - } - - if (hexMd5.str() != m_owner->package()->md5()) { -diff --git a/simgear/package/md5.c b/simgear/package/md5.c -index 93878e9..31a78d8 100644 ---- a/simgear/package/md5.c -+++ b/simgear/package/md5.c -@@ -1,266 +1,250 @@ --/* -- ********************************************************************** -- ** md5.c ** -- ** RSA Data Security, Inc. MD5 Message Digest Algorithm ** -- ** Created: 2/17/90 RLR ** -- ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version ** -- ********************************************************************** -- */ -+/* $OpenBSD: md5.c,v 1.7 2004/05/28 15:10:27 millert Exp $ */ - - /* -- ********************************************************************** -- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -- ** ** -- ** License to copy and use this software is granted provided that ** -- ** it is identified as the "RSA Data Security, Inc. MD5 Message ** -- ** Digest Algorithm" in all material mentioning or referencing this ** -- ** software or this function. ** -- ** ** -- ** License is also granted to make and use derivative works ** -- ** provided that such works are identified as "derived from the RSA ** -- ** Data Security, Inc. MD5 Message Digest Algorithm" in all ** -- ** material mentioning or referencing the derived work. ** -- ** ** -- ** RSA Data Security, Inc. makes no representations concerning ** -- ** either the merchantability of this software or the suitability ** -- ** of this software for any particular purpose. It is provided "as ** -- ** is" without express or implied warranty of any kind. ** -- ** ** -- ** These notices must be retained in any copies of any part of this ** -- ** documentation and/or software. ** -- ********************************************************************** -+ * This code implements the MD5 message-digest algorithm. -+ * The algorithm is due to Ron Rivest. This code was -+ * written by Colin Plumb in 1993, no copyright is claimed. -+ * This code is in the public domain; do with it what you wish. -+ * -+ * Equivalent code is available from RSA Data Security, Inc. -+ * This code has been tested against that, and is equivalent, -+ * except that you don't need to include two pages of legalese -+ * with every copy. -+ * -+ * To compute the message digest of a chunk of bytes, declare an -+ * MD5Context structure, pass it to MD5Init, call MD5Update as -+ * needed on buffers full of bytes, and then call MD5Final, which -+ * will fill a supplied 16-byte array with the digest. - */ - --/* -- include the following line if the md5.h header file is separate -- */ --#include "md5.h" -- --/* forward declaration */ --static void Transform (); - --static unsigned char PADDING[64] = { -- 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 --}; -- --/* F, G and H are basic MD5 functions: selection, majority, parity */ --#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) --#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) --#define H(x, y, z) ((x) ^ (y) ^ (z)) --#define I(x, y, z) ((y) ^ ((x) | (~z))) -+#include -+#include - --/* ROTATE_LEFT rotates x left n bits */ --#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) -+#include "md5.h" - --/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */ --/* Rotation is separate from addition to prevent recomputation */ --#define FF(a, b, c, d, x, s, ac) \ -- {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \ -- (a) = ROTATE_LEFT ((a), (s)); \ -- (a) += (b); \ -- } --#define GG(a, b, c, d, x, s, ac) \ -- {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \ -- (a) = ROTATE_LEFT ((a), (s)); \ -- (a) += (b); \ -- } --#define HH(a, b, c, d, x, s, ac) \ -- {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \ -- (a) = ROTATE_LEFT ((a), (s)); \ -- (a) += (b); \ -- } --#define II(a, b, c, d, x, s, ac) \ -- {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \ -- (a) = ROTATE_LEFT ((a), (s)); \ -- (a) += (b); \ -- } -+#define PUT_64BIT_LE(cp, value) do { \ -+ (cp)[7] = (value) >> 56; \ -+ (cp)[6] = (value) >> 48; \ -+ (cp)[5] = (value) >> 40; \ -+ (cp)[4] = (value) >> 32; \ -+ (cp)[3] = (value) >> 24; \ -+ (cp)[2] = (value) >> 16; \ -+ (cp)[1] = (value) >> 8; \ -+ (cp)[0] = (value); } while (0) -+ -+#define PUT_32BIT_LE(cp, value) do { \ -+ (cp)[3] = (value) >> 24; \ -+ (cp)[2] = (value) >> 16; \ -+ (cp)[1] = (value) >> 8; \ -+ (cp)[0] = (value); } while (0) -+ -+static u_int8_t PADDING[MD5_BLOCK_LENGTH] = { -+ 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 -+}; - --void SG_MD5Init (SG_MD5_CTX *mdContext) -+/* -+ * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious -+ * initialization constants. -+ */ -+void -+SG_MD5Init(SG_MD5_CTX *ctx) - { -- mdContext->i[0] = mdContext->i[1] = (UINT4)0; -- -- /* Load magic initialization constants. -- */ -- mdContext->buf[0] = (UINT4)0x67452301; -- mdContext->buf[1] = (UINT4)0xefcdab89; -- mdContext->buf[2] = (UINT4)0x98badcfe; -- mdContext->buf[3] = (UINT4)0x10325476; -+ ctx->count = 0; -+ ctx->state[0] = 0x67452301; -+ ctx->state[1] = 0xefcdab89; -+ ctx->state[2] = 0x98badcfe; -+ ctx->state[3] = 0x10325476; - } - --void SG_MD5Update (SG_MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen) -+/* -+ * Update context to reflect the concatenation of another buffer full -+ * of bytes. -+ */ -+void -+SG_MD5Update(SG_MD5_CTX *ctx, const unsigned char *input, size_t len) - { -- UINT4 in[16]; -- int mdi; -- unsigned int i, ii; -- -- /* compute number of bytes mod 64 */ -- mdi = (int)((mdContext->i[0] >> 3) & 0x3F); -- -- /* update number of bits */ -- if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0]) -- mdContext->i[1]++; -- mdContext->i[0] += ((UINT4)inLen << 3); -- mdContext->i[1] += ((UINT4)inLen >> 29); -- -- while (inLen--) { -- /* add new character to buffer, increment mdi */ -- mdContext->in[mdi++] = *inBuf++; -- -- /* transform if necessary */ -- if (mdi == 0x40) { -- for (i = 0, ii = 0; i < 16; i++, ii += 4) -- in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | -- (((UINT4)mdContext->in[ii+2]) << 16) | -- (((UINT4)mdContext->in[ii+1]) << 8) | -- ((UINT4)mdContext->in[ii]); -- Transform (mdContext->buf, in); -- mdi = 0; -- } -- } -+ size_t have, need; -+ -+ /* Check how many bytes we already have and how many more we need. */ -+ have = (size_t)((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1)); -+ need = MD5_BLOCK_LENGTH - have; -+ -+ /* Update bitcount */ -+ ctx->count += (u_int64_t)len << 3; -+ -+ if (len >= need) { -+ if (have != 0) { -+ memcpy(ctx->buffer + have, input, need); -+ SG_MD5Transform(ctx->state, ctx->buffer); -+ input += need; -+ len -= need; -+ have = 0; -+ } -+ -+ /* Process data in MD5_BLOCK_LENGTH-byte chunks. */ -+ while (len >= MD5_BLOCK_LENGTH) { -+ SG_MD5Transform(ctx->state, input); -+ input += MD5_BLOCK_LENGTH; -+ len -= MD5_BLOCK_LENGTH; -+ } -+ } -+ -+ /* Handle any remaining bytes of data. */ -+ if (len != 0) -+ memcpy(ctx->buffer + have, input, len); - } - --void SG_MD5Final (SG_MD5_CTX *mdContext) -+/* -+ * Pad pad to 64-byte boundary with the bit pattern -+ * 1 0* (64-bit count of bits processed, MSB-first) -+ */ -+void -+SG_MD5Pad(SG_MD5_CTX *ctx) - { -- UINT4 in[16]; -- int mdi; -- unsigned int i, ii; -- unsigned int padLen; -- -- /* save number of bits */ -- in[14] = mdContext->i[0]; -- in[15] = mdContext->i[1]; -- -- /* compute number of bytes mod 64 */ -- mdi = (int)((mdContext->i[0] >> 3) & 0x3F); -- -- /* pad out to 56 mod 64 */ -- padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi); -- SG_MD5Update (mdContext, PADDING, padLen); -- -- /* append length in bits and transform */ -- for (i = 0, ii = 0; i < 14; i++, ii += 4) -- in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | -- (((UINT4)mdContext->in[ii+2]) << 16) | -- (((UINT4)mdContext->in[ii+1]) << 8) | -- ((UINT4)mdContext->in[ii]); -- Transform (mdContext->buf, in); -- -- /* store buffer in digest */ -- for (i = 0, ii = 0; i < 4; i++, ii += 4) { -- mdContext->digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF); -- mdContext->digest[ii+1] = -- (unsigned char)((mdContext->buf[i] >> 8) & 0xFF); -- mdContext->digest[ii+2] = -- (unsigned char)((mdContext->buf[i] >> 16) & 0xFF); -- mdContext->digest[ii+3] = -- (unsigned char)((mdContext->buf[i] >> 24) & 0xFF); -- } -+ u_int8_t count[8]; -+ size_t padlen; -+ -+ /* Convert count to 8 bytes in little endian order. */ -+ PUT_64BIT_LE(count, ctx->count); -+ -+ /* Pad out to 56 mod 64. */ -+ padlen = MD5_BLOCK_LENGTH - -+ ((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1)); -+ if (padlen < 1 + 8) -+ padlen += MD5_BLOCK_LENGTH; -+ SG_MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */ -+ SG_MD5Update(ctx, count, 8); - } - --/* Basic MD5 step. Transform buf based on in. -+/* -+ * Final wrapup--call MD5Pad, fill in digest and zero out ctx. - */ --static void Transform (buf, in) --UINT4 *buf; --UINT4 *in; -+void -+SG_MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], SG_MD5_CTX *ctx) - { -- UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; -- -- /* Round 1 */ --#define S11 7 --#define S12 12 --#define S13 17 --#define S14 22 -- FF ( a, b, c, d, in[ 0], S11, 3614090360); /* 1 */ -- FF ( d, a, b, c, in[ 1], S12, 3905402710); /* 2 */ -- FF ( c, d, a, b, in[ 2], S13, 606105819); /* 3 */ -- FF ( b, c, d, a, in[ 3], S14, 3250441966); /* 4 */ -- FF ( a, b, c, d, in[ 4], S11, 4118548399); /* 5 */ -- FF ( d, a, b, c, in[ 5], S12, 1200080426); /* 6 */ -- FF ( c, d, a, b, in[ 6], S13, 2821735955); /* 7 */ -- FF ( b, c, d, a, in[ 7], S14, 4249261313); /* 8 */ -- FF ( a, b, c, d, in[ 8], S11, 1770035416); /* 9 */ -- FF ( d, a, b, c, in[ 9], S12, 2336552879); /* 10 */ -- FF ( c, d, a, b, in[10], S13, 4294925233); /* 11 */ -- FF ( b, c, d, a, in[11], S14, 2304563134); /* 12 */ -- FF ( a, b, c, d, in[12], S11, 1804603682); /* 13 */ -- FF ( d, a, b, c, in[13], S12, 4254626195); /* 14 */ -- FF ( c, d, a, b, in[14], S13, 2792965006); /* 15 */ -- FF ( b, c, d, a, in[15], S14, 1236535329); /* 16 */ -+ int i; -+ -+ SG_MD5Pad(ctx); -+ if (digest != NULL) { -+ for (i = 0; i < 4; i++) -+ PUT_32BIT_LE(digest + i * 4, ctx->state[i]); -+ memset(ctx, 0, sizeof(*ctx)); -+ } -+} - -- /* Round 2 */ --#define S21 5 --#define S22 9 --#define S23 14 --#define S24 20 -- GG ( a, b, c, d, in[ 1], S21, 4129170786); /* 17 */ -- GG ( d, a, b, c, in[ 6], S22, 3225465664); /* 18 */ -- GG ( c, d, a, b, in[11], S23, 643717713); /* 19 */ -- GG ( b, c, d, a, in[ 0], S24, 3921069994); /* 20 */ -- GG ( a, b, c, d, in[ 5], S21, 3593408605); /* 21 */ -- GG ( d, a, b, c, in[10], S22, 38016083); /* 22 */ -- GG ( c, d, a, b, in[15], S23, 3634488961); /* 23 */ -- GG ( b, c, d, a, in[ 4], S24, 3889429448); /* 24 */ -- GG ( a, b, c, d, in[ 9], S21, 568446438); /* 25 */ -- GG ( d, a, b, c, in[14], S22, 3275163606); /* 26 */ -- GG ( c, d, a, b, in[ 3], S23, 4107603335); /* 27 */ -- GG ( b, c, d, a, in[ 8], S24, 1163531501); /* 28 */ -- GG ( a, b, c, d, in[13], S21, 2850285829); /* 29 */ -- GG ( d, a, b, c, in[ 2], S22, 4243563512); /* 30 */ -- GG ( c, d, a, b, in[ 7], S23, 1735328473); /* 31 */ -- GG ( b, c, d, a, in[12], S24, 2368359562); /* 32 */ - -- /* Round 3 */ --#define S31 4 --#define S32 11 --#define S33 16 --#define S34 23 -- HH ( a, b, c, d, in[ 5], S31, 4294588738); /* 33 */ -- HH ( d, a, b, c, in[ 8], S32, 2272392833); /* 34 */ -- HH ( c, d, a, b, in[11], S33, 1839030562); /* 35 */ -- HH ( b, c, d, a, in[14], S34, 4259657740); /* 36 */ -- HH ( a, b, c, d, in[ 1], S31, 2763975236); /* 37 */ -- HH ( d, a, b, c, in[ 4], S32, 1272893353); /* 38 */ -- HH ( c, d, a, b, in[ 7], S33, 4139469664); /* 39 */ -- HH ( b, c, d, a, in[10], S34, 3200236656); /* 40 */ -- HH ( a, b, c, d, in[13], S31, 681279174); /* 41 */ -- HH ( d, a, b, c, in[ 0], S32, 3936430074); /* 42 */ -- HH ( c, d, a, b, in[ 3], S33, 3572445317); /* 43 */ -- HH ( b, c, d, a, in[ 6], S34, 76029189); /* 44 */ -- HH ( a, b, c, d, in[ 9], S31, 3654602809); /* 45 */ -- HH ( d, a, b, c, in[12], S32, 3873151461); /* 46 */ -- HH ( c, d, a, b, in[15], S33, 530742520); /* 47 */ -- HH ( b, c, d, a, in[ 2], S34, 3299628645); /* 48 */ -+/* The four core functions - F1 is optimized somewhat */ - -- /* Round 4 */ --#define S41 6 --#define S42 10 --#define S43 15 --#define S44 21 -- II ( a, b, c, d, in[ 0], S41, 4096336452); /* 49 */ -- II ( d, a, b, c, in[ 7], S42, 1126891415); /* 50 */ -- II ( c, d, a, b, in[14], S43, 2878612391); /* 51 */ -- II ( b, c, d, a, in[ 5], S44, 4237533241); /* 52 */ -- II ( a, b, c, d, in[12], S41, 1700485571); /* 53 */ -- II ( d, a, b, c, in[ 3], S42, 2399980690); /* 54 */ -- II ( c, d, a, b, in[10], S43, 4293915773); /* 55 */ -- II ( b, c, d, a, in[ 1], S44, 2240044497); /* 56 */ -- II ( a, b, c, d, in[ 8], S41, 1873313359); /* 57 */ -- II ( d, a, b, c, in[15], S42, 4264355552); /* 58 */ -- II ( c, d, a, b, in[ 6], S43, 2734768916); /* 59 */ -- II ( b, c, d, a, in[13], S44, 1309151649); /* 60 */ -- II ( a, b, c, d, in[ 4], S41, 4149444226); /* 61 */ -- II ( d, a, b, c, in[11], S42, 3174756917); /* 62 */ -- II ( c, d, a, b, in[ 2], S43, 718787259); /* 63 */ -- II ( b, c, d, a, in[ 9], S44, 3951481745); /* 64 */ -+/* #define F1(x, y, z) (x & y | ~x & z) */ -+#define F1(x, y, z) (z ^ (x & (y ^ z))) -+#define F2(x, y, z) F1(z, x, y) -+#define F3(x, y, z) (x ^ y ^ z) -+#define F4(x, y, z) (y ^ (x | ~z)) - -- buf[0] += a; -- buf[1] += b; -- buf[2] += c; -- buf[3] += d; --} -+/* This is the central step in the MD5 algorithm. */ -+#define MD5STEP(f, w, x, y, z, data, s) \ -+ ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) - -+/* -+ * The core of the MD5 algorithm, this alters an existing MD5 hash to -+ * reflect the addition of 16 longwords of new data. MD5Update blocks -+ * the data and converts bytes into longwords for this routine. -+ */ -+void -+SG_MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH]) -+{ -+ u_int32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4]; -+ -+#ifndef WORDS_BIGENDIAN -+ memcpy(in, block, sizeof(in)); -+#else -+ for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) { -+ in[a] = (u_int32_t)( -+ (u_int32_t)(block[a * 4 + 0]) | -+ (u_int32_t)(block[a * 4 + 1]) << 8 | -+ (u_int32_t)(block[a * 4 + 2]) << 16 | -+ (u_int32_t)(block[a * 4 + 3]) << 24); -+ } -+#endif -+ -+ a = state[0]; -+ b = state[1]; -+ c = state[2]; -+ d = state[3]; -+ -+ MD5STEP(F1, a, b, c, d, in[ 0] + 0xd76aa478, 7); -+ MD5STEP(F1, d, a, b, c, in[ 1] + 0xe8c7b756, 12); -+ MD5STEP(F1, c, d, a, b, in[ 2] + 0x242070db, 17); -+ MD5STEP(F1, b, c, d, a, in[ 3] + 0xc1bdceee, 22); -+ MD5STEP(F1, a, b, c, d, in[ 4] + 0xf57c0faf, 7); -+ MD5STEP(F1, d, a, b, c, in[ 5] + 0x4787c62a, 12); -+ MD5STEP(F1, c, d, a, b, in[ 6] + 0xa8304613, 17); -+ MD5STEP(F1, b, c, d, a, in[ 7] + 0xfd469501, 22); -+ MD5STEP(F1, a, b, c, d, in[ 8] + 0x698098d8, 7); -+ MD5STEP(F1, d, a, b, c, in[ 9] + 0x8b44f7af, 12); -+ MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); -+ MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); -+ MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); -+ MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); -+ MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); -+ MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); -+ -+ MD5STEP(F2, a, b, c, d, in[ 1] + 0xf61e2562, 5); -+ MD5STEP(F2, d, a, b, c, in[ 6] + 0xc040b340, 9); -+ MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); -+ MD5STEP(F2, b, c, d, a, in[ 0] + 0xe9b6c7aa, 20); -+ MD5STEP(F2, a, b, c, d, in[ 5] + 0xd62f105d, 5); -+ MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); -+ MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); -+ MD5STEP(F2, b, c, d, a, in[ 4] + 0xe7d3fbc8, 20); -+ MD5STEP(F2, a, b, c, d, in[ 9] + 0x21e1cde6, 5); -+ MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); -+ MD5STEP(F2, c, d, a, b, in[ 3] + 0xf4d50d87, 14); -+ MD5STEP(F2, b, c, d, a, in[ 8] + 0x455a14ed, 20); -+ MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); -+ MD5STEP(F2, d, a, b, c, in[ 2] + 0xfcefa3f8, 9); -+ MD5STEP(F2, c, d, a, b, in[ 7] + 0x676f02d9, 14); -+ MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); -+ -+ MD5STEP(F3, a, b, c, d, in[ 5] + 0xfffa3942, 4); -+ MD5STEP(F3, d, a, b, c, in[ 8] + 0x8771f681, 11); -+ MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); -+ MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); -+ MD5STEP(F3, a, b, c, d, in[ 1] + 0xa4beea44, 4); -+ MD5STEP(F3, d, a, b, c, in[ 4] + 0x4bdecfa9, 11); -+ MD5STEP(F3, c, d, a, b, in[ 7] + 0xf6bb4b60, 16); -+ MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); -+ MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); -+ MD5STEP(F3, d, a, b, c, in[ 0] + 0xeaa127fa, 11); -+ MD5STEP(F3, c, d, a, b, in[ 3] + 0xd4ef3085, 16); -+ MD5STEP(F3, b, c, d, a, in[ 6] + 0x04881d05, 23); -+ MD5STEP(F3, a, b, c, d, in[ 9] + 0xd9d4d039, 4); -+ MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); -+ MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); -+ MD5STEP(F3, b, c, d, a, in[2 ] + 0xc4ac5665, 23); -+ -+ MD5STEP(F4, a, b, c, d, in[ 0] + 0xf4292244, 6); -+ MD5STEP(F4, d, a, b, c, in[7 ] + 0x432aff97, 10); -+ MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); -+ MD5STEP(F4, b, c, d, a, in[5 ] + 0xfc93a039, 21); -+ MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); -+ MD5STEP(F4, d, a, b, c, in[3 ] + 0x8f0ccc92, 10); -+ MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); -+ MD5STEP(F4, b, c, d, a, in[1 ] + 0x85845dd1, 21); -+ MD5STEP(F4, a, b, c, d, in[8 ] + 0x6fa87e4f, 6); -+ MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); -+ MD5STEP(F4, c, d, a, b, in[6 ] + 0xa3014314, 15); -+ MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); -+ MD5STEP(F4, a, b, c, d, in[4 ] + 0xf7537e82, 6); -+ MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); -+ MD5STEP(F4, c, d, a, b, in[2 ] + 0x2ad7d2bb, 15); -+ MD5STEP(F4, b, c, d, a, in[9 ] + 0xeb86d391, 21); -+ -+ state[0] += a; -+ state[1] += b; -+ state[2] += c; -+ state[3] += d; -+} -\ No newline at end of file -diff --git a/simgear/package/md5.h b/simgear/package/md5.h -index d1823da..0c15736 100644 ---- a/simgear/package/md5.h -+++ b/simgear/package/md5.h -@@ -1,68 +1,46 @@ --#ifndef SG_PACKAGE_MD5_H --#define SG_PACKAGE_MD5_H -+ /* $OpenBSD: md5.h,v 1.15 2004/05/03 17:30:14 millert Exp $ */ - - /* -- ********************************************************************** -- ** md5.h -- Header file for implementation of MD5 ** -- ** RSA Data Security, Inc. MD5 Message Digest Algorithm ** -- ** Created: 2/17/90 RLR ** -- ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version ** -- ** Revised (for MD5): RLR 4/27/91 ** -- ** -- G modified to have y&~z instead of y&z ** -- ** -- FF, GG, HH modified to add in last register done ** -- ** -- Access pattern: round 2 works mod 5, round 3 works mod 3 ** -- ** -- distinct additive constant for each step ** -- ** -- round 4 added, working mod 7 ** -- ********************************************************************** -+ * This code implements the MD5 message-digest algorithm. -+ * The algorithm is due to Ron Rivest. This code was -+ * written by Colin Plumb in 1993, no copyright is claimed. -+ * This code is in the public domain; do with it what you wish. -+ * -+ * Equivalent code is available from RSA Data Security, Inc. -+ * This code has been tested against that, and is equivalent, -+ * except that you don't need to include two pages of legalese -+ * with every copy. - */ - --/* -- ********************************************************************** -- ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** -- ** ** -- ** License to copy and use this software is granted provided that ** -- ** it is identified as the "RSA Data Security, Inc. MD5 Message ** -- ** Digest Algorithm" in all material mentioning or referencing this ** -- ** software or this function. ** -- ** ** -- ** License is also granted to make and use derivative works ** -- ** provided that such works are identified as "derived from the RSA ** -- ** Data Security, Inc. MD5 Message Digest Algorithm" in all ** -- ** material mentioning or referencing the derived work. ** -- ** ** -- ** RSA Data Security, Inc. makes no representations concerning ** -- ** either the merchantability of this software or the suitability ** -- ** of this software for any particular purpose. It is provided "as ** -- ** is" without express or implied warranty of any kind. ** -- ** ** -- ** These notices must be retained in any copies of any part of this ** -- ** documentation and/or software. ** -- ********************************************************************** -- */ -+#ifndef _MD5_H_ -+#define _MD5_H_ - - #ifdef __cplusplus - extern "C" { - #endif - --/* typedef a 32 bit type */ --typedef unsigned int UINT4; -+#define MD5_BLOCK_LENGTH 64 -+#define MD5_DIGEST_LENGTH 16 -+#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) - --/* Data structure for MD5 (Message Digest) computation */ --typedef struct { -- UINT4 i[2]; /* number of _bits_ handled mod 2^64 */ -- UINT4 buf[4]; /* scratch buffer */ -- unsigned char in[64]; /* input buffer */ -- unsigned char digest[16]; /* actual digest after MD5Final call */ -+typedef struct MD5Context { -+ u_int32_t state[4]; /* state */ -+ u_int64_t count; /* number of bits, mod 2^64 */ -+ u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } SG_MD5_CTX; - --void SG_MD5Init (SG_MD5_CTX *mdContext); --void SG_MD5Update (SG_MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen); --void SG_MD5Final (SG_MD5_CTX *mdContext); -+void SG_MD5Init(SG_MD5_CTX *); -+void SG_MD5Update(SG_MD5_CTX *, const u_int8_t *, size_t); -+void SG_MD5Pad(SG_MD5_CTX *); -+void SG_MD5Final(u_int8_t [MD5_DIGEST_LENGTH], SG_MD5_CTX *); -+void SG_MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]); - - #ifdef __cplusplus - } // of extern C - #endif -+ -+#endif /* _MD5_H_ */ -+ - --#endif // of SG_PACKAGE_MD5_H - - -\ No newline at end of file diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/patches/series simgear-3.0.0/debian/patches/series --- simgear-3.0.0~git20140204+c99ea4/debian/patches/series 2014-02-08 15:14:36.000000000 +0000 +++ simgear-3.0.0/debian/patches/series 2014-02-17 17:10:34.000000000 +0000 @@ -1,2 +1 @@ -replace_md5.patch -sgstream_ignore_write_error.patch +sgstream_test_fix_length.patch diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/patches/sgstream_ignore_write_error.patch simgear-3.0.0/debian/patches/sgstream_ignore_write_error.patch --- simgear-3.0.0~git20140204+c99ea4/debian/patches/sgstream_ignore_write_error.patch 2014-02-08 15:14:36.000000000 +0000 +++ simgear-3.0.0/debian/patches/sgstream_ignore_write_error.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Description: Don't fail test on unrelated I/O error - -This test frequently fails to write the test file in mips (real or qemu). -Since this doesn't use the library under test (the functionality being -tested is _reading_ the file), it does not indicate a bug in the library. - -diff --git a/simgear/misc/sgstream_test.cxx b/simgear/misc/sgstream_test.cxx -index 0188f99..52efba7 100644 ---- a/simgear/misc/sgstream_test.cxx -+++ b/simgear/misc/sgstream_test.cxx -@@ -21,6 +21,10 @@ int main() - "fourth line as well\r\n" - "fifth line is another CR/LF line\r\n" - "end of test\r\n", 1024); -+ if (!(f.good())){ -+ cout << "Unable to run test due to I/O error " << f.rdstate(); -+ return EXIT_SUCCESS; -+ } - f.close(); - } - - diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/patches/sgstream_test_fix_length.patch simgear-3.0.0/debian/patches/sgstream_test_fix_length.patch --- simgear-3.0.0~git20140204+c99ea4/debian/patches/sgstream_test_fix_length.patch 1970-01-01 00:00:00.000000000 +0000 +++ simgear-3.0.0/debian/patches/sgstream_test_fix_length.patch 2014-02-17 17:10:02.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Don't read past the end of the string +Author: Rebecca Palmer +Forwarded: no + +--- simgear-3.0.0~git20140204+c99ea4.orig/simgear/misc/sgstream_test.cxx ++++ simgear-3.0.0~git20140204+c99ea4/simgear/misc/sgstream_test.cxx +@@ -20,7 +20,7 @@ int main() + "third line ends with both\r\n" + "fourth line as well\r\n" + "fifth line is another CR/LF line\r\n" +- "end of test\r\n", 1024); ++ "end of test\r\n", 158); + f.close(); + } + diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/rules simgear-3.0.0/debian/rules --- simgear-3.0.0~git20140204+c99ea4/debian/rules 2014-02-08 15:14:36.000000000 +0000 +++ simgear-3.0.0/debian/rules 2014-02-17 17:26:45.000000000 +0000 @@ -61,11 +61,6 @@ mkdir build cd build && cmake .. $(CMAKE_FLAGS) -# Temporarily ignore test suite failures, so we can unblock the -# openscenegraph transition. Only mips ever failed, so far. -override_dh_auto_test: - dh_auto_test -- ARGS+=-V || echo "IGNORING TEST SUITE FAILURE" - override_dh_strip: dh_strip -plibsimgearcore$(UVER) --dbg-package=libsimgearcore$(UVER)-dbg dh_strip -plibsimgearscene$(UVER) --dbg-package=libsimgearscene$(UVER)-dbg diff -Nru simgear-3.0.0~git20140204+c99ea4/debian/watch simgear-3.0.0/debian/watch --- simgear-3.0.0~git20140204+c99ea4/debian/watch 2014-02-08 15:14:36.000000000 +0000 +++ simgear-3.0.0/debian/watch 2014-02-17 14:48:47.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -#ftp://ftp.simgear.org/pub/simgear/Source/simgear-(.*)\.tar\.bz2 -ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-(.*)\.tar\.bz2 +opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/ \ + ftp://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-(.*)\.tar\.bz2 diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/canvas/elements/CanvasElement.cxx simgear-3.0.0/simgear/canvas/elements/CanvasElement.cxx --- simgear-3.0.0~git20140204+c99ea4/simgear/canvas/elements/CanvasElement.cxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/canvas/elements/CanvasElement.cxx 2014-02-15 00:04:11.000000000 +0000 @@ -167,66 +167,8 @@ // Don't do anything if element is hidden return; - if( _transform_dirty ) - { - osg::Matrix m; - for( size_t i = 0; i < _transform_types.size(); ++i ) - { - // Skip unused indizes... - if( _transform_types[i] == TT_NONE ) - continue; - - SGPropertyNode* tf_node = _node->getChild("tf", i, true); - - // Build up the matrix representation of the current transform node - osg::Matrix tf; - switch( _transform_types[i] ) - { - case TT_MATRIX: - tf = osg::Matrix( tf_node->getDoubleValue("m[0]", 1), - tf_node->getDoubleValue("m[1]", 0), - 0, - tf_node->getDoubleValue("m[6]", 0), - - tf_node->getDoubleValue("m[2]", 0), - tf_node->getDoubleValue("m[3]", 1), - 0, - tf_node->getDoubleValue("m[7]", 0), - - 0, - 0, - 1, - 0, - - tf_node->getDoubleValue("m[4]", 0), - tf_node->getDoubleValue("m[5]", 0), - 0, - tf_node->getDoubleValue("m[8]", 1) ); - break; - case TT_TRANSLATE: - tf.makeTranslate( osg::Vec3f( tf_node->getDoubleValue("t[0]", 0), - tf_node->getDoubleValue("t[1]", 0), - 0 ) ); - break; - case TT_ROTATE: - tf.makeRotate( tf_node->getDoubleValue("rot", 0), 0, 0, 1 ); - break; - case TT_SCALE: - { - float sx = tf_node->getDoubleValue("s[0]", 1); - // sy defaults to sx... - tf.makeScale( sx, tf_node->getDoubleValue("s[1]", sx), 1 ); - break; - } - default: - break; - } - m.postMult( tf ); - } - _transform->setMatrix(m); - _transform_dirty = false; - _attributes_dirty |= SCISSOR_COORDS; - } + // Trigger matrix update + getMatrix(); if( _attributes_dirty & SCISSOR_COORDS ) { @@ -364,7 +306,7 @@ _transform_types.resize( child->getIndex() + 1 ); _transform_types[ child->getIndex() ] = TT_NONE; - _transform_dirty = true; + _attributes_dirty |= TRANSFORM; return; } else if( parent->getParent() == _node @@ -385,7 +327,7 @@ else if( name == "s" ) type = TT_SCALE; - _transform_dirty = true; + _attributes_dirty |= TRANSFORM; return; } @@ -418,7 +360,7 @@ while( !_transform_types.empty() && _transform_types.back() == TT_NONE ) _transform_types.pop_back(); - _transform_dirty = true; + _attributes_dirty |= TRANSFORM; return; } else if( StyleInfo const* style = getStyleInfo(child->getNameString()) ) @@ -460,7 +402,7 @@ else if( parent->getParent() == _node && parent->getNameString() == NAME_TRANSFORM ) { - _transform_dirty = true; + _attributes_dirty |= TRANSFORM; return; } @@ -584,6 +526,73 @@ } //---------------------------------------------------------------------------- + osg::Matrix Element::getMatrix() const + { + if( !(_attributes_dirty & TRANSFORM) ) + return _transform->getMatrix(); + + osg::Matrix m; + for( size_t i = 0; i < _transform_types.size(); ++i ) + { + // Skip unused indizes... + if( _transform_types[i] == TT_NONE ) + continue; + + SGPropertyNode* tf_node = _node->getChild("tf", i, true); + + // Build up the matrix representation of the current transform node + osg::Matrix tf; + switch( _transform_types[i] ) + { + case TT_MATRIX: + tf = osg::Matrix( tf_node->getDoubleValue("m[0]", 1), + tf_node->getDoubleValue("m[1]", 0), + 0, + tf_node->getDoubleValue("m[6]", 0), + + tf_node->getDoubleValue("m[2]", 0), + tf_node->getDoubleValue("m[3]", 1), + 0, + tf_node->getDoubleValue("m[7]", 0), + + 0, + 0, + 1, + 0, + + tf_node->getDoubleValue("m[4]", 0), + tf_node->getDoubleValue("m[5]", 0), + 0, + tf_node->getDoubleValue("m[8]", 1) ); + break; + case TT_TRANSLATE: + tf.makeTranslate( osg::Vec3f( tf_node->getDoubleValue("t[0]", 0), + tf_node->getDoubleValue("t[1]", 0), + 0 ) ); + break; + case TT_ROTATE: + tf.makeRotate( tf_node->getDoubleValue("rot", 0), 0, 0, 1 ); + break; + case TT_SCALE: + { + float sx = tf_node->getDoubleValue("s[0]", 1); + // sy defaults to sx... + tf.makeScale( sx, tf_node->getDoubleValue("s[1]", sx), 1 ); + break; + } + default: + break; + } + m.postMult( tf ); + } + _transform->setMatrix(m); + _attributes_dirty &= ~TRANSFORM; + _attributes_dirty |= SCISSOR_COORDS; + + return m; + } + + //---------------------------------------------------------------------------- Element::StyleSetters Element::_style_setters; //---------------------------------------------------------------------------- @@ -595,7 +604,6 @@ _canvas( canvas ), _parent( parent ), _attributes_dirty( 0 ), - _transform_dirty( false ), _transform( new osg::MatrixTransform ), _style( parent_style ), _scissor( 0 ), diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/canvas/elements/CanvasElement.hxx simgear-3.0.0/simgear/canvas/elements/CanvasElement.hxx --- simgear-3.0.0~git20140204+c99ea4/simgear/canvas/elements/CanvasElement.hxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/canvas/elements/CanvasElement.hxx 2014-02-15 00:04:11.000000000 +0000 @@ -158,6 +158,11 @@ virtual osg::BoundingBox getTransformedBounds(const osg::Matrix& m) const; /** + * Get the transformation matrix (product of all transforms) + */ + osg::Matrix getMatrix() const; + + /** * Create an canvas Element * * @tparam Derived Type of element (needs to derive from Element) @@ -181,7 +186,8 @@ enum Attributes { - BLEND_FUNC = 1, + TRANSFORM = 1, + BLEND_FUNC = TRANSFORM << 1, SCISSOR_COORDS = BLEND_FUNC << 1, LAST_ATTRIBUTE = SCISSOR_COORDS << 1 }; @@ -200,9 +206,8 @@ CanvasWeakPtr _canvas; Element *_parent; - uint32_t _attributes_dirty; + mutable uint32_t _attributes_dirty; - bool _transform_dirty; osg::observer_ptr _transform; std::vector _transform_types; diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/canvas/elements/CanvasPath.cxx simgear-3.0.0/simgear/canvas/elements/CanvasPath.cxx --- simgear-3.0.0~git20140204+c99ea4/simgear/canvas/elements/CanvasPath.cxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/canvas/elements/CanvasPath.cxx 2014-02-15 00:04:11.000000000 +0000 @@ -277,7 +277,8 @@ { osg::BoundingBox bb; - osg::Vec2f cur; // VG "Current point" (in local coordinates) + osg::Vec2f cur(0, 0), // VG "Current point" (in local coordinates) + sub(0, 0); // beginning of current sub path VGubyte cmd_index = 0; for( size_t i = 0, ci = 0; i < _cmds.size() && ci < _coords.size(); @@ -297,6 +298,7 @@ switch( cmd ) { case VG_CLOSE_PATH: + cur = sub; break; case VG_MOVE_TO: case VG_LINE_TO: @@ -352,7 +354,12 @@ } if( num_coords > 0 ) + { cur = points[ num_coords - 1 ]; + + if( cmd == VG_MOVE_TO ) + sub = cur; + } } return bb; diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/io/SVNReportParser.cxx simgear-3.0.0/simgear/io/SVNReportParser.cxx --- simgear-3.0.0~git20140204+c99ea4/simgear/io/SVNReportParser.cxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/io/SVNReportParser.cxx 2014-02-15 00:04:11.000000000 +0000 @@ -377,8 +377,9 @@ memset(&md5Context, 0, sizeof(SG_MD5_CTX)); SG_MD5Init(&md5Context); SG_MD5Update(&md5Context, (unsigned char*) output.data(), output.size()); - SG_MD5Final(&md5Context); - decodedFileMd5 = strutils::encodeHex(md5Context.digest, 16); + unsigned char digest[MD5_DIGEST_LENGTH]; + SG_MD5Final(digest, &md5Context); + decodedFileMd5 = strutils::encodeHex(digest, MD5_DIGEST_LENGTH); return true; } diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/package/Install.cxx simgear-3.0.0/simgear/package/Install.cxx --- simgear-3.0.0~git20140204+c99ea4/simgear/package/Install.cxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/package/Install.cxx 2014-02-15 00:04:11.000000000 +0000 @@ -89,13 +89,14 @@ return; } - SG_MD5Final(&m_md5); + unsigned char digest[MD5_DIGEST_LENGTH]; + SG_MD5Final(digest, &m_md5); // convert final sum to hex const char hexChar[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; std::stringstream hexMd5; - for (int i=0; i<16;++i) { - hexMd5 << hexChar[m_md5.digest[i] >> 4]; - hexMd5 << hexChar[m_md5.digest[i] & 0x0f]; + for (int i=0; i> 4]; + hexMd5 << hexChar[digest[i] & 0x0f]; } if (hexMd5.str() != m_owner->package()->md5()) { diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/package/md5.c simgear-3.0.0/simgear/package/md5.c --- simgear-3.0.0~git20140204+c99ea4/simgear/package/md5.c 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/package/md5.c 2014-02-15 00:04:11.000000000 +0000 @@ -1,266 +1,250 @@ -/* - ********************************************************************** - ** md5.c ** - ** RSA Data Security, Inc. MD5 Message Digest Algorithm ** - ** Created: 2/17/90 RLR ** - ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version ** - ********************************************************************** - */ +/* $OpenBSD: md5.c,v 1.7 2004/05/28 15:10:27 millert Exp $ */ /* - ********************************************************************** - ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** - ** ** - ** License to copy and use this software is granted provided that ** - ** it is identified as the "RSA Data Security, Inc. MD5 Message ** - ** Digest Algorithm" in all material mentioning or referencing this ** - ** software or this function. ** - ** ** - ** License is also granted to make and use derivative works ** - ** provided that such works are identified as "derived from the RSA ** - ** Data Security, Inc. MD5 Message Digest Algorithm" in all ** - ** material mentioning or referencing the derived work. ** - ** ** - ** RSA Data Security, Inc. makes no representations concerning ** - ** either the merchantability of this software or the suitability ** - ** of this software for any particular purpose. It is provided "as ** - ** is" without express or implied warranty of any kind. ** - ** ** - ** These notices must be retained in any copies of any part of this ** - ** documentation and/or software. ** - ********************************************************************** + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. + * + * To compute the message digest of a chunk of bytes, declare an + * MD5Context structure, pass it to MD5Init, call MD5Update as + * needed on buffers full of bytes, and then call MD5Final, which + * will fill a supplied 16-byte array with the digest. */ -/* -- include the following line if the md5.h header file is separate -- */ -#include "md5.h" -/* forward declaration */ -static void Transform (); +#include +#include -static unsigned char PADDING[64] = { - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -}; +#include "md5.h" -/* F, G and H are basic MD5 functions: selection, majority, parity */ -#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) -#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) -#define I(x, y, z) ((y) ^ ((x) | (~z))) - -/* ROTATE_LEFT rotates x left n bits */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) - -/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */ -/* Rotation is separate from addition to prevent recomputation */ -#define FF(a, b, c, d, x, s, ac) \ - {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define GG(a, b, c, d, x, s, ac) \ - {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define HH(a, b, c, d, x, s, ac) \ - {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } -#define II(a, b, c, d, x, s, ac) \ - {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \ - (a) = ROTATE_LEFT ((a), (s)); \ - (a) += (b); \ - } +#define PUT_64BIT_LE(cp, value) do { \ + (cp)[7] = (value) >> 56; \ + (cp)[6] = (value) >> 48; \ + (cp)[5] = (value) >> 40; \ + (cp)[4] = (value) >> 32; \ + (cp)[3] = (value) >> 24; \ + (cp)[2] = (value) >> 16; \ + (cp)[1] = (value) >> 8; \ + (cp)[0] = (value); } while (0) + +#define PUT_32BIT_LE(cp, value) do { \ + (cp)[3] = (value) >> 24; \ + (cp)[2] = (value) >> 16; \ + (cp)[1] = (value) >> 8; \ + (cp)[0] = (value); } while (0) + +static u_int8_t PADDING[MD5_BLOCK_LENGTH] = { + 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 +}; -void SG_MD5Init (SG_MD5_CTX *mdContext) +/* + * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious + * initialization constants. + */ +void +SG_MD5Init(SG_MD5_CTX *ctx) { - mdContext->i[0] = mdContext->i[1] = (UINT4)0; - - /* Load magic initialization constants. - */ - mdContext->buf[0] = (UINT4)0x67452301; - mdContext->buf[1] = (UINT4)0xefcdab89; - mdContext->buf[2] = (UINT4)0x98badcfe; - mdContext->buf[3] = (UINT4)0x10325476; + ctx->count = 0; + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xefcdab89; + ctx->state[2] = 0x98badcfe; + ctx->state[3] = 0x10325476; } -void SG_MD5Update (SG_MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen) +/* + * Update context to reflect the concatenation of another buffer full + * of bytes. + */ +void +SG_MD5Update(SG_MD5_CTX *ctx, const unsigned char *input, size_t len) { - UINT4 in[16]; - int mdi; - unsigned int i, ii; - - /* compute number of bytes mod 64 */ - mdi = (int)((mdContext->i[0] >> 3) & 0x3F); - - /* update number of bits */ - if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0]) - mdContext->i[1]++; - mdContext->i[0] += ((UINT4)inLen << 3); - mdContext->i[1] += ((UINT4)inLen >> 29); - - while (inLen--) { - /* add new character to buffer, increment mdi */ - mdContext->in[mdi++] = *inBuf++; - - /* transform if necessary */ - if (mdi == 0x40) { - for (i = 0, ii = 0; i < 16; i++, ii += 4) - in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | - (((UINT4)mdContext->in[ii+2]) << 16) | - (((UINT4)mdContext->in[ii+1]) << 8) | - ((UINT4)mdContext->in[ii]); - Transform (mdContext->buf, in); - mdi = 0; - } - } + size_t have, need; + + /* Check how many bytes we already have and how many more we need. */ + have = (size_t)((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1)); + need = MD5_BLOCK_LENGTH - have; + + /* Update bitcount */ + ctx->count += (u_int64_t)len << 3; + + if (len >= need) { + if (have != 0) { + memcpy(ctx->buffer + have, input, need); + SG_MD5Transform(ctx->state, ctx->buffer); + input += need; + len -= need; + have = 0; + } + + /* Process data in MD5_BLOCK_LENGTH-byte chunks. */ + while (len >= MD5_BLOCK_LENGTH) { + SG_MD5Transform(ctx->state, input); + input += MD5_BLOCK_LENGTH; + len -= MD5_BLOCK_LENGTH; + } + } + + /* Handle any remaining bytes of data. */ + if (len != 0) + memcpy(ctx->buffer + have, input, len); } -void SG_MD5Final (SG_MD5_CTX *mdContext) +/* + * Pad pad to 64-byte boundary with the bit pattern + * 1 0* (64-bit count of bits processed, MSB-first) + */ +void +SG_MD5Pad(SG_MD5_CTX *ctx) { - UINT4 in[16]; - int mdi; - unsigned int i, ii; - unsigned int padLen; - - /* save number of bits */ - in[14] = mdContext->i[0]; - in[15] = mdContext->i[1]; - - /* compute number of bytes mod 64 */ - mdi = (int)((mdContext->i[0] >> 3) & 0x3F); - - /* pad out to 56 mod 64 */ - padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi); - SG_MD5Update (mdContext, PADDING, padLen); - - /* append length in bits and transform */ - for (i = 0, ii = 0; i < 14; i++, ii += 4) - in[i] = (((UINT4)mdContext->in[ii+3]) << 24) | - (((UINT4)mdContext->in[ii+2]) << 16) | - (((UINT4)mdContext->in[ii+1]) << 8) | - ((UINT4)mdContext->in[ii]); - Transform (mdContext->buf, in); - - /* store buffer in digest */ - for (i = 0, ii = 0; i < 4; i++, ii += 4) { - mdContext->digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF); - mdContext->digest[ii+1] = - (unsigned char)((mdContext->buf[i] >> 8) & 0xFF); - mdContext->digest[ii+2] = - (unsigned char)((mdContext->buf[i] >> 16) & 0xFF); - mdContext->digest[ii+3] = - (unsigned char)((mdContext->buf[i] >> 24) & 0xFF); - } + u_int8_t count[8]; + size_t padlen; + + /* Convert count to 8 bytes in little endian order. */ + PUT_64BIT_LE(count, ctx->count); + + /* Pad out to 56 mod 64. */ + padlen = MD5_BLOCK_LENGTH - + ((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1)); + if (padlen < 1 + 8) + padlen += MD5_BLOCK_LENGTH; + SG_MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */ + SG_MD5Update(ctx, count, 8); } -/* Basic MD5 step. Transform buf based on in. +/* + * Final wrapup--call MD5Pad, fill in digest and zero out ctx. */ -static void Transform (buf, in) -UINT4 *buf; -UINT4 *in; +void +SG_MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], SG_MD5_CTX *ctx) { - UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; + int i; - /* Round 1 */ -#define S11 7 -#define S12 12 -#define S13 17 -#define S14 22 - FF ( a, b, c, d, in[ 0], S11, 3614090360); /* 1 */ - FF ( d, a, b, c, in[ 1], S12, 3905402710); /* 2 */ - FF ( c, d, a, b, in[ 2], S13, 606105819); /* 3 */ - FF ( b, c, d, a, in[ 3], S14, 3250441966); /* 4 */ - FF ( a, b, c, d, in[ 4], S11, 4118548399); /* 5 */ - FF ( d, a, b, c, in[ 5], S12, 1200080426); /* 6 */ - FF ( c, d, a, b, in[ 6], S13, 2821735955); /* 7 */ - FF ( b, c, d, a, in[ 7], S14, 4249261313); /* 8 */ - FF ( a, b, c, d, in[ 8], S11, 1770035416); /* 9 */ - FF ( d, a, b, c, in[ 9], S12, 2336552879); /* 10 */ - FF ( c, d, a, b, in[10], S13, 4294925233); /* 11 */ - FF ( b, c, d, a, in[11], S14, 2304563134); /* 12 */ - FF ( a, b, c, d, in[12], S11, 1804603682); /* 13 */ - FF ( d, a, b, c, in[13], S12, 4254626195); /* 14 */ - FF ( c, d, a, b, in[14], S13, 2792965006); /* 15 */ - FF ( b, c, d, a, in[15], S14, 1236535329); /* 16 */ - - /* Round 2 */ -#define S21 5 -#define S22 9 -#define S23 14 -#define S24 20 - GG ( a, b, c, d, in[ 1], S21, 4129170786); /* 17 */ - GG ( d, a, b, c, in[ 6], S22, 3225465664); /* 18 */ - GG ( c, d, a, b, in[11], S23, 643717713); /* 19 */ - GG ( b, c, d, a, in[ 0], S24, 3921069994); /* 20 */ - GG ( a, b, c, d, in[ 5], S21, 3593408605); /* 21 */ - GG ( d, a, b, c, in[10], S22, 38016083); /* 22 */ - GG ( c, d, a, b, in[15], S23, 3634488961); /* 23 */ - GG ( b, c, d, a, in[ 4], S24, 3889429448); /* 24 */ - GG ( a, b, c, d, in[ 9], S21, 568446438); /* 25 */ - GG ( d, a, b, c, in[14], S22, 3275163606); /* 26 */ - GG ( c, d, a, b, in[ 3], S23, 4107603335); /* 27 */ - GG ( b, c, d, a, in[ 8], S24, 1163531501); /* 28 */ - GG ( a, b, c, d, in[13], S21, 2850285829); /* 29 */ - GG ( d, a, b, c, in[ 2], S22, 4243563512); /* 30 */ - GG ( c, d, a, b, in[ 7], S23, 1735328473); /* 31 */ - GG ( b, c, d, a, in[12], S24, 2368359562); /* 32 */ - - /* Round 3 */ -#define S31 4 -#define S32 11 -#define S33 16 -#define S34 23 - HH ( a, b, c, d, in[ 5], S31, 4294588738); /* 33 */ - HH ( d, a, b, c, in[ 8], S32, 2272392833); /* 34 */ - HH ( c, d, a, b, in[11], S33, 1839030562); /* 35 */ - HH ( b, c, d, a, in[14], S34, 4259657740); /* 36 */ - HH ( a, b, c, d, in[ 1], S31, 2763975236); /* 37 */ - HH ( d, a, b, c, in[ 4], S32, 1272893353); /* 38 */ - HH ( c, d, a, b, in[ 7], S33, 4139469664); /* 39 */ - HH ( b, c, d, a, in[10], S34, 3200236656); /* 40 */ - HH ( a, b, c, d, in[13], S31, 681279174); /* 41 */ - HH ( d, a, b, c, in[ 0], S32, 3936430074); /* 42 */ - HH ( c, d, a, b, in[ 3], S33, 3572445317); /* 43 */ - HH ( b, c, d, a, in[ 6], S34, 76029189); /* 44 */ - HH ( a, b, c, d, in[ 9], S31, 3654602809); /* 45 */ - HH ( d, a, b, c, in[12], S32, 3873151461); /* 46 */ - HH ( c, d, a, b, in[15], S33, 530742520); /* 47 */ - HH ( b, c, d, a, in[ 2], S34, 3299628645); /* 48 */ - - /* Round 4 */ -#define S41 6 -#define S42 10 -#define S43 15 -#define S44 21 - II ( a, b, c, d, in[ 0], S41, 4096336452); /* 49 */ - II ( d, a, b, c, in[ 7], S42, 1126891415); /* 50 */ - II ( c, d, a, b, in[14], S43, 2878612391); /* 51 */ - II ( b, c, d, a, in[ 5], S44, 4237533241); /* 52 */ - II ( a, b, c, d, in[12], S41, 1700485571); /* 53 */ - II ( d, a, b, c, in[ 3], S42, 2399980690); /* 54 */ - II ( c, d, a, b, in[10], S43, 4293915773); /* 55 */ - II ( b, c, d, a, in[ 1], S44, 2240044497); /* 56 */ - II ( a, b, c, d, in[ 8], S41, 1873313359); /* 57 */ - II ( d, a, b, c, in[15], S42, 4264355552); /* 58 */ - II ( c, d, a, b, in[ 6], S43, 2734768916); /* 59 */ - II ( b, c, d, a, in[13], S44, 1309151649); /* 60 */ - II ( a, b, c, d, in[ 4], S41, 4149444226); /* 61 */ - II ( d, a, b, c, in[11], S42, 3174756917); /* 62 */ - II ( c, d, a, b, in[ 2], S43, 718787259); /* 63 */ - II ( b, c, d, a, in[ 9], S44, 3951481745); /* 64 */ - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; + SG_MD5Pad(ctx); + if (digest != NULL) { + for (i = 0; i < 4; i++) + PUT_32BIT_LE(digest + i * 4, ctx->state[i]); + memset(ctx, 0, sizeof(*ctx)); + } } + +/* The four core functions - F1 is optimized somewhat */ + +/* #define F1(x, y, z) (x & y | ~x & z) */ +#define F1(x, y, z) (z ^ (x & (y ^ z))) +#define F2(x, y, z) F1(z, x, y) +#define F3(x, y, z) (x ^ y ^ z) +#define F4(x, y, z) (y ^ (x | ~z)) + +/* This is the central step in the MD5 algorithm. */ +#define MD5STEP(f, w, x, y, z, data, s) \ + ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) + +/* + * The core of the MD5 algorithm, this alters an existing MD5 hash to + * reflect the addition of 16 longwords of new data. MD5Update blocks + * the data and converts bytes into longwords for this routine. + */ +void +SG_MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH]) +{ + u_int32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4]; + +#ifndef WORDS_BIGENDIAN + memcpy(in, block, sizeof(in)); +#else + for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) { + in[a] = (u_int32_t)( + (u_int32_t)(block[a * 4 + 0]) | + (u_int32_t)(block[a * 4 + 1]) << 8 | + (u_int32_t)(block[a * 4 + 2]) << 16 | + (u_int32_t)(block[a * 4 + 3]) << 24); + } +#endif + + a = state[0]; + b = state[1]; + c = state[2]; + d = state[3]; + + MD5STEP(F1, a, b, c, d, in[ 0] + 0xd76aa478, 7); + MD5STEP(F1, d, a, b, c, in[ 1] + 0xe8c7b756, 12); + MD5STEP(F1, c, d, a, b, in[ 2] + 0x242070db, 17); + MD5STEP(F1, b, c, d, a, in[ 3] + 0xc1bdceee, 22); + MD5STEP(F1, a, b, c, d, in[ 4] + 0xf57c0faf, 7); + MD5STEP(F1, d, a, b, c, in[ 5] + 0x4787c62a, 12); + MD5STEP(F1, c, d, a, b, in[ 6] + 0xa8304613, 17); + MD5STEP(F1, b, c, d, a, in[ 7] + 0xfd469501, 22); + MD5STEP(F1, a, b, c, d, in[ 8] + 0x698098d8, 7); + MD5STEP(F1, d, a, b, c, in[ 9] + 0x8b44f7af, 12); + MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); + MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); + MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); + MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); + MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); + MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); + + MD5STEP(F2, a, b, c, d, in[ 1] + 0xf61e2562, 5); + MD5STEP(F2, d, a, b, c, in[ 6] + 0xc040b340, 9); + MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); + MD5STEP(F2, b, c, d, a, in[ 0] + 0xe9b6c7aa, 20); + MD5STEP(F2, a, b, c, d, in[ 5] + 0xd62f105d, 5); + MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); + MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); + MD5STEP(F2, b, c, d, a, in[ 4] + 0xe7d3fbc8, 20); + MD5STEP(F2, a, b, c, d, in[ 9] + 0x21e1cde6, 5); + MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); + MD5STEP(F2, c, d, a, b, in[ 3] + 0xf4d50d87, 14); + MD5STEP(F2, b, c, d, a, in[ 8] + 0x455a14ed, 20); + MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); + MD5STEP(F2, d, a, b, c, in[ 2] + 0xfcefa3f8, 9); + MD5STEP(F2, c, d, a, b, in[ 7] + 0x676f02d9, 14); + MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); + + MD5STEP(F3, a, b, c, d, in[ 5] + 0xfffa3942, 4); + MD5STEP(F3, d, a, b, c, in[ 8] + 0x8771f681, 11); + MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); + MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); + MD5STEP(F3, a, b, c, d, in[ 1] + 0xa4beea44, 4); + MD5STEP(F3, d, a, b, c, in[ 4] + 0x4bdecfa9, 11); + MD5STEP(F3, c, d, a, b, in[ 7] + 0xf6bb4b60, 16); + MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); + MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); + MD5STEP(F3, d, a, b, c, in[ 0] + 0xeaa127fa, 11); + MD5STEP(F3, c, d, a, b, in[ 3] + 0xd4ef3085, 16); + MD5STEP(F3, b, c, d, a, in[ 6] + 0x04881d05, 23); + MD5STEP(F3, a, b, c, d, in[ 9] + 0xd9d4d039, 4); + MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); + MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); + MD5STEP(F3, b, c, d, a, in[2 ] + 0xc4ac5665, 23); + + MD5STEP(F4, a, b, c, d, in[ 0] + 0xf4292244, 6); + MD5STEP(F4, d, a, b, c, in[7 ] + 0x432aff97, 10); + MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); + MD5STEP(F4, b, c, d, a, in[5 ] + 0xfc93a039, 21); + MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); + MD5STEP(F4, d, a, b, c, in[3 ] + 0x8f0ccc92, 10); + MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); + MD5STEP(F4, b, c, d, a, in[1 ] + 0x85845dd1, 21); + MD5STEP(F4, a, b, c, d, in[8 ] + 0x6fa87e4f, 6); + MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); + MD5STEP(F4, c, d, a, b, in[6 ] + 0xa3014314, 15); + MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); + MD5STEP(F4, a, b, c, d, in[4 ] + 0xf7537e82, 6); + MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); + MD5STEP(F4, c, d, a, b, in[2 ] + 0x2ad7d2bb, 15); + MD5STEP(F4, b, c, d, a, in[9 ] + 0xeb86d391, 21); + + state[0] += a; + state[1] += b; + state[2] += c; + state[3] += d; +} \ No newline at end of file diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/package/md5.h simgear-3.0.0/simgear/package/md5.h --- simgear-3.0.0~git20140204+c99ea4/simgear/package/md5.h 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/package/md5.h 2014-02-15 00:04:11.000000000 +0000 @@ -1,68 +1,52 @@ -#ifndef SG_PACKAGE_MD5_H -#define SG_PACKAGE_MD5_H + /* $OpenBSD: md5.h,v 1.15 2004/05/03 17:30:14 millert Exp $ */ /* - ********************************************************************** - ** md5.h -- Header file for implementation of MD5 ** - ** RSA Data Security, Inc. MD5 Message Digest Algorithm ** - ** Created: 2/17/90 RLR ** - ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version ** - ** Revised (for MD5): RLR 4/27/91 ** - ** -- G modified to have y&~z instead of y&z ** - ** -- FF, GG, HH modified to add in last register done ** - ** -- Access pattern: round 2 works mod 5, round 3 works mod 3 ** - ** -- distinct additive constant for each step ** - ** -- round 4 added, working mod 7 ** - ********************************************************************** + * This code implements the MD5 message-digest algorithm. + * The algorithm is due to Ron Rivest. This code was + * written by Colin Plumb in 1993, no copyright is claimed. + * This code is in the public domain; do with it what you wish. + * + * Equivalent code is available from RSA Data Security, Inc. + * This code has been tested against that, and is equivalent, + * except that you don't need to include two pages of legalese + * with every copy. */ -/* - ********************************************************************** - ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. ** - ** ** - ** License to copy and use this software is granted provided that ** - ** it is identified as the "RSA Data Security, Inc. MD5 Message ** - ** Digest Algorithm" in all material mentioning or referencing this ** - ** software or this function. ** - ** ** - ** License is also granted to make and use derivative works ** - ** provided that such works are identified as "derived from the RSA ** - ** Data Security, Inc. MD5 Message Digest Algorithm" in all ** - ** material mentioning or referencing the derived work. ** - ** ** - ** RSA Data Security, Inc. makes no representations concerning ** - ** either the merchantability of this software or the suitability ** - ** of this software for any particular purpose. It is provided "as ** - ** is" without express or implied warranty of any kind. ** - ** ** - ** These notices must be retained in any copies of any part of this ** - ** documentation and/or software. ** - ********************************************************************** - */ +#ifndef _MD5_H_ +#define _MD5_H_ #ifdef __cplusplus extern "C" { #endif -/* typedef a 32 bit type */ -typedef unsigned int UINT4; - -/* Data structure for MD5 (Message Digest) computation */ -typedef struct { - UINT4 i[2]; /* number of _bits_ handled mod 2^64 */ - UINT4 buf[4]; /* scratch buffer */ - unsigned char in[64]; /* input buffer */ - unsigned char digest[16]; /* actual digest after MD5Final call */ +#if defined(_MSC_VER) +typedef unsigned char u_int8_t; +typedef unsigned int u_int32_t; +typedef unsigned __int64 u_int64_t; +#endif + +#define MD5_BLOCK_LENGTH 64 +#define MD5_DIGEST_LENGTH 16 +#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) + +typedef struct MD5Context { + u_int32_t state[4]; /* state */ + u_int64_t count; /* number of bits, mod 2^64 */ + u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ } SG_MD5_CTX; -void SG_MD5Init (SG_MD5_CTX *mdContext); -void SG_MD5Update (SG_MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen); -void SG_MD5Final (SG_MD5_CTX *mdContext); +void SG_MD5Init(SG_MD5_CTX *); +void SG_MD5Update(SG_MD5_CTX *, const u_int8_t *, size_t); +void SG_MD5Pad(SG_MD5_CTX *); +void SG_MD5Final(u_int8_t [MD5_DIGEST_LENGTH], SG_MD5_CTX *); +void SG_MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]); #ifdef __cplusplus } // of extern C #endif + +#endif /* _MD5_H_ */ + -#endif // of SG_PACKAGE_MD5_H \ No newline at end of file diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/scene/material/mat.cxx simgear-3.0.0/simgear/scene/material/mat.cxx --- simgear-3.0.0~git20140204+c99ea4/simgear/scene/material/mat.cxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/scene/material/mat.cxx 2014-02-15 00:04:11.000000000 +0000 @@ -50,6 +50,8 @@ #include #include #include +#include + #include #include #include @@ -455,6 +457,7 @@ Effect* SGMaterial::get_effect(const SGTexturedTriangleBin& triangleBin) { + SGGuard g(_lock); if (_status.empty()) { SG_LOG( SG_GENERAL, SG_WARN, "No effect available."); return 0; @@ -466,6 +469,7 @@ Effect* SGMaterial::get_effect() { + SGGuard g(_lock); return get_effect(0); } diff -Nru simgear-3.0.0~git20140204+c99ea4/simgear/scene/material/mat.hxx simgear-3.0.0/simgear/scene/material/mat.hxx --- simgear-3.0.0~git20140204+c99ea4/simgear/scene/material/mat.hxx 2014-02-04 17:39:10.000000000 +0000 +++ simgear-3.0.0/simgear/scene/material/mat.hxx 2014-02-15 00:04:11.000000000 +0000 @@ -43,6 +43,7 @@ } #include +#include // for SGMutex #include #include @@ -473,6 +474,9 @@ // Parameters from the materials file const SGPropertyNode* parameters; + // per-material lock for entrypoints called from multiple threads + SGMutex _lock; + //////////////////////////////////////////////////////////////////// // Internal constructors and methods. ////////////////////////////////////////////////////////////////////