Update freetype to 2.5.4.

third_party/freetype/src/base/md5.c

 /*
  * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
  * MD5 Message-Digest Algorithm (RFC 1321).
  *
  * Homepage:
  * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
  *
  * Author:
  * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
  *
@@ skipping 32 matching lines @@
 
 /*
  * The basic MD5 functions.
  *
  * F and G are optimized compared to their RFC 1321 definitions for
  * architectures that lack an AND-NOT instruction, just like in Colin Plumb's
  * implementation.
  */
 #define F(x, y, z)                      ((z) ^ ((x) & ((y) ^ (z))))
 #define G(x, y, z)                      ((y) ^ ((z) & ((x) ^ (y))))
-#define H(x, y, z)                      ((x) ^ (y) ^ (z))
+#define H(x, y, z)                      (((x) ^ (y)) ^ (z))
+#define H2(x, y, z)                     ((x) ^ ((y) ^ (z)))
 #define I(x, y, z)                      ((y) ^ ((x) | ~(z)))
 
 /*
  * The MD5 transformation for all four rounds.
  */
 #define STEP(f, a, b, c, d, x, t, s) \
         (a) += f((b), (c), (d)) + (x) + (t); \
         (a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \
         (a) += (b);
 
@@ skipping 18 matching lines @@
         ((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
         ((MD5_u32plus)ptr[(n) * 4 + 3] << 24))
 #define GET(n) \
         (ctx->block[(n)])
 #endif
 
 /*
  * This processes one or more 64-byte data blocks, but does NOT update
  * the bit counters.  There are no alignment requirements.
  */
-static void *body(MD5_CTX *ctx, void *data, unsigned long size)
+static const void *body(MD5_CTX *ctx, const void *data, unsigned long size)
 {
-        unsigned char *ptr;
+        const unsigned char *ptr;
         MD5_u32plus a, b, c, d;
         MD5_u32plus saved_a, saved_b, saved_c, saved_d;
 
-        ptr = (unsigned char *)data;
+        ptr = (const unsigned char *)data;
 
         a = ctx->a;
         b = ctx->b;
         c = ctx->c;
         d = ctx->d;
 
         do {
                 saved_a = a;
                 saved_b = b;
                 saved_c = c;
@@ skipping 30 matching lines @@
                 STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9)
                 STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14)
                 STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20)
                 STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5)
                 STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9)
                 STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14)
                 STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20)
 
 /* Round 3 */
                 STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4)
-                STEP(H, d, a, b, c, GET(8), 0x8771f681, 11)
+                STEP(H2, d, a, b, c, GET(8), 0x8771f681, 11)
                 STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16)
-                STEP(H, b, c, d, a, GET(14), 0xfde5380c, 23)
+                STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23)
                 STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4)
-                STEP(H, d, a, b, c, GET(4), 0x4bdecfa9, 11)
+                STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9, 11)
                 STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16)
-                STEP(H, b, c, d, a, GET(10), 0xbebfbc70, 23)
+                STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23)
                 STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4)
-                STEP(H, d, a, b, c, GET(0), 0xeaa127fa, 11)
+                STEP(H2, d, a, b, c, GET(0), 0xeaa127fa, 11)
                 STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16)
-                STEP(H, b, c, d, a, GET(6), 0x04881d05, 23)
+                STEP(H2, b, c, d, a, GET(6), 0x04881d05, 23)
                 STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4)
-                STEP(H, d, a, b, c, GET(12), 0xe6db99e5, 11)
+                STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11)
                 STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16)
-                STEP(H, b, c, d, a, GET(2), 0xc4ac5665, 23)
+                STEP(H2, b, c, d, a, GET(2), 0xc4ac5665, 23)
 
 /* Round 4 */
                 STEP(I, a, b, c, d, GET(0), 0xf4292244, 6)
                 STEP(I, d, a, b, c, GET(7), 0x432aff97, 10)
                 STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15)
                 STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21)
                 STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6)
                 STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10)
                 STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15)
                 STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21)
@@ skipping 26 matching lines @@
 {
         ctx->a = 0x67452301;
         ctx->b = 0xefcdab89;
         ctx->c = 0x98badcfe;
         ctx->d = 0x10325476;
 
         ctx->lo = 0;
         ctx->hi = 0;
 }
 
-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size)
+void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
 {
         MD5_u32plus saved_lo;
-        unsigned long used, free;
+        unsigned long used, available;
 
         saved_lo = ctx->lo;
         if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
                 ctx->hi++;
         ctx->hi += size >> 29;
 
         used = saved_lo & 0x3f;
 
         if (used) {
-                free = 64 - used;
+                available = 64 - used;
 
-                if (size < free) {
+                if (size < available) {
                         memcpy(&ctx->buffer[used], data, size);
                         return;
                 }
 
-                memcpy(&ctx->buffer[used], data, free);
-                data = (unsigned char *)data + free;
-                size -= free;
+                memcpy(&ctx->buffer[used], data, available);
+                data = (const unsigned char *)data + available;
+                size -= available;
                 body(ctx, ctx->buffer, 64);
         }
 
         if (size >= 64) {
                 data = body(ctx, data, size & ~(unsigned long)0x3f);
                 size &= 0x3f;
         }
 
         memcpy(ctx->buffer, data, size);
 }
 
 void MD5_Final(unsigned char *result, MD5_CTX *ctx)
 {
-        unsigned long used, free;
+        unsigned long used, available;
 
         used = ctx->lo & 0x3f;
 
         ctx->buffer[used++] = 0x80;
 
-        free = 64 - used;
+        available = 64 - used;
 
-        if (free < 8) {
-                memset(&ctx->buffer[used], 0, free);
+        if (available < 8) {
+                memset(&ctx->buffer[used], 0, available);
                 body(ctx, ctx->buffer, 64);
                 used = 0;
-                free = 64;
+                available = 64;
         }
 
-        memset(&ctx->buffer[used], 0, free - 8);
+        memset(&ctx->buffer[used], 0, available - 8);
 
         ctx->lo <<= 3;
         ctx->buffer[56] = ctx->lo;
         ctx->buffer[57] = ctx->lo >> 8;
         ctx->buffer[58] = ctx->lo >> 16;
         ctx->buffer[59] = ctx->lo >> 24;
         ctx->buffer[60] = ctx->hi;
         ctx->buffer[61] = ctx->hi >> 8;
         ctx->buffer[62] = ctx->hi >> 16;
         ctx->buffer[63] = ctx->hi >> 24;
@@ skipping 14 matching lines @@
         result[11] = ctx->c >> 24;
         result[12] = ctx->d;
         result[13] = ctx->d >> 8;
         result[14] = ctx->d >> 16;
         result[15] = ctx->d >> 24;
 
         memset(ctx, 0, sizeof(*ctx));
 }
 
 #endif