removed butil/md5.cc butil/md5.h test/md5_unittest.cc which is replaceable by openssl/md5.h

BUILD

@@ -179,7 +179,6 @@ BUTIL_SRCS = [
     "src/butil/hash.cc",
     "src/butil/lazy_instance.cc",
     "src/butil/location.cc",
-    "src/butil/md5.cc",
     "src/butil/memory/aligned_memory.cc",
     "src/butil/memory/ref_counted.cc",
     "src/butil/memory/ref_counted_memory.cc",

CMakeLists.txt

@@ -285,7 +285,6 @@ set(BUTIL_SOURCES
     ${PROJECT_SOURCE_DIR}/src/butil/hash.cc
     ${PROJECT_SOURCE_DIR}/src/butil/lazy_instance.cc
     ${PROJECT_SOURCE_DIR}/src/butil/location.cc
-    ${PROJECT_SOURCE_DIR}/src/butil/md5.cc
     ${PROJECT_SOURCE_DIR}/src/butil/memory/aligned_memory.cc
     ${PROJECT_SOURCE_DIR}/src/butil/memory/ref_counted.cc
     ${PROJECT_SOURCE_DIR}/src/butil/memory/ref_counted_memory.cc

Makefile

@@ -96,7 +96,6 @@ BUTIL_SOURCES = \
     src/butil/hash.cc \
     src/butil/lazy_instance.cc \
     src/butil/location.cc \
-    src/butil/md5.cc \
     src/butil/memory/aligned_memory.cc \
     src/butil/memory/ref_counted.cc \
     src/butil/memory/ref_counted_memory.cc \

src/butil/md5.cc

@@ -1,304 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// The original file was copied from sqlite, and was in the public domain.
-
-/*
- * 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 "butil/md5.h"
-
-#include "butil/basictypes.h"
-
-namespace {
-
-struct Context {
-  uint32_t buf[4];
-  uint32_t bits[2];
-  unsigned char in[64];
-};
-
-/*
- * Note: this code is harmless on little-endian machines.
- */
-void byteReverse(unsigned char *buf, unsigned longs) {
-        uint32_t t;
-        do {
-                t = (uint32_t)((unsigned)buf[3]<<8 | buf[2]) << 16 |
-                            ((unsigned)buf[1]<<8 | buf[0]);
-                *(uint32_t *)buf = t;
-                buf += 4;
-        } while (--longs);
-}
-
-/* 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<<s | 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 MD5Transform(uint32_t buf[4], const uint32_t in[16]) {
-        uint32_t a, b, c, d;
-
-        a = buf[0];
-        b = buf[1];
-        c = buf[2];
-        d = buf[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);
-
-        buf[0] += a;
-        buf[1] += b;
-        buf[2] += c;
-        buf[3] += d;
-}
-
-}  // namespace
-
-namespace butil {
-
-/*
- * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
- * initialization constants.
- */
-void MD5Init(MD5Context* context) {
-        struct Context *ctx = (struct Context *)context;
-        ctx->buf[0] = 0x67452301;
-        ctx->buf[1] = 0xefcdab89;
-        ctx->buf[2] = 0x98badcfe;
-        ctx->buf[3] = 0x10325476;
-        ctx->bits[0] = 0;
-        ctx->bits[1] = 0;
-}
-
-/*
- * Update context to reflect the concatenation of another buffer full
- * of bytes.
- */
-void MD5Update(MD5Context* context, const StringPiece& data) {
-        const unsigned char* inbuf = (const unsigned char*)data.data();
-        size_t len = data.size();
-        struct Context *ctx = (struct Context *)context;
-        const unsigned char* buf = (const unsigned char*)inbuf;
-        uint32_t t;
-
-        /* Update bitcount */
-
-        t = ctx->bits[0];
-        if ((ctx->bits[0] = t + ((uint32_t)len << 3)) < t)
-                ctx->bits[1]++; /* Carry from low to high */
-        ctx->bits[1] += static_cast<uint32_t>(len >> 29);
-
-        t = (t >> 3) & 0x3f;    /* Bytes already in shsInfo->data */
-
-        /* Handle any leading odd-sized chunks */
-
-        if (t) {
-                unsigned char *p = (unsigned char *)ctx->in + t;
-
-                t = 64-t;
-                if (len < t) {
-                        memcpy(p, buf, len);
-                        return;
-                }
-                memcpy(p, buf, t);
-                byteReverse(ctx->in, 16);
-                MD5Transform(ctx->buf, (uint32_t *)ctx->in);
-                buf += t;
-                len -= t;
-        }
-
-        /* Process data in 64-byte chunks */
-
-        while (len >= 64) {
-                memcpy(ctx->in, buf, 64);
-                byteReverse(ctx->in, 16);
-                MD5Transform(ctx->buf, (uint32_t *)ctx->in);
-                buf += 64;
-                len -= 64;
-        }
-
-        /* Handle any remaining bytes of data. */
-
-        memcpy(ctx->in, buf, len);
-}
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern
- * 1 0* (64-bit count of bits processed, MSB-first)
- */
-void MD5Final(MD5Digest* digest, MD5Context* context) {
-        struct Context *ctx = (struct Context *)context;
-        unsigned count;
-        unsigned char *p;
-
-        /* Compute number of bytes mod 64 */
-        count = (ctx->bits[0] >> 3) & 0x3F;
-
-        /* Set the first char of padding to 0x80.  This is safe since there is
-           always at least one byte free */
-        p = ctx->in + count;
-        *p++ = 0x80;
-
-        /* Bytes of padding needed to make 64 bytes */
-        count = 64 - 1 - count;
-
-        /* Pad out to 56 mod 64 */
-        if (count < 8) {
-                /* Two lots of padding:  Pad the first block to 64 bytes */
-                memset(p, 0, count);
-                byteReverse(ctx->in, 16);
-                MD5Transform(ctx->buf, (uint32_t *)ctx->in);
-
-                /* Now fill the next block with 56 bytes */
-                memset(ctx->in, 0, 56);
-        } else {
-                /* Pad block to 56 bytes */
-                memset(p, 0, count-8);
-        }
-        byteReverse(ctx->in, 14);
-
-        /* Append length in bits and transform */
-        memcpy(&ctx->in[14 * sizeof(ctx->bits[0])],
-               &ctx->bits[0],
-               sizeof(ctx->bits[0]));
-        memcpy(&ctx->in[15 * sizeof(ctx->bits[1])],
-               &ctx->bits[1],
-               sizeof(ctx->bits[1]));
-
-        MD5Transform(ctx->buf, (uint32_t *)ctx->in);
-        byteReverse((unsigned char *)ctx->buf, 4);
-        memcpy(digest->a, ctx->buf, 16);
-        memset(ctx, 0, sizeof(*ctx));    /* In case it's sensitive */
-}
-
-void MD5IntermediateFinal(MD5Digest* digest, const MD5Context* context) {
-  /* MD5Final mutates the MD5Context*. Make a copy for generating the
-     intermediate value. */
-  MD5Context context_copy;
-  memcpy(&context_copy, context, sizeof(context_copy));
-  MD5Final(digest, &context_copy);
-}
-
-std::string MD5DigestToBase16(const MD5Digest& digest) {
-  static char const zEncode[] = "0123456789abcdef";
-
-  std::string ret;
-  ret.resize(32);
-
-  int j = 0;
-  for (int i = 0; i < 16; i ++) {
-    int a = digest.a[i];
-    ret[j++] = zEncode[(a>>4)&0xf];
-    ret[j++] = zEncode[a & 0xf];
-  }
-  return ret;
-}
-
-void MD5Sum(const void* data, size_t length, MD5Digest* digest) {
-  MD5Context ctx;
-  MD5Init(&ctx);
-  MD5Update(&ctx,
-            StringPiece(reinterpret_cast<const char*>(data), length));
-  MD5Final(digest, &ctx);
-}
-
-std::string MD5String(const StringPiece& str) {
-  MD5Digest digest;
-  MD5Sum(str.data(), str.length(), &digest);
-  return MD5DigestToBase16(digest);
-}
-
-}  // namespace butil

src/butil/md5.h

@@ -1,75 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BUTIL_MD5_H_
-#define BUTIL_MD5_H_
-
-#include "butil/base_export.h"
-#include "butil/strings/string_piece.h"
-
-namespace butil {
-
-// MD5 stands for Message Digest algorithm 5.
-// MD5 is a robust hash function, designed for cyptography, but often used
-// for file checksums.  The code is complex and slow, but has few
-// collisions.
-// See Also:
-//   http://en.wikipedia.org/wiki/MD5
-
-// These functions perform MD5 operations. The simplest call is MD5Sum() to
-// generate the MD5 sum of the given data.
-//
-// You can also compute the MD5 sum of data incrementally by making multiple
-// calls to MD5Update():
-//   MD5Context ctx; // intermediate MD5 data: do not use
-//   MD5Init(&ctx);
-//   MD5Update(&ctx, data1, length1);
-//   MD5Update(&ctx, data2, length2);
-//   ...
-//
-//   MD5Digest digest; // the result of the computation
-//   MD5Final(&digest, &ctx);
-//
-// You can call MD5DigestToBase16() to generate a string of the digest.
-
-// The output of an MD5 operation.
-struct MD5Digest {
-  unsigned char a[16];
-};
-
-// Used for storing intermediate data during an MD5 computation. Callers
-// should not access the data.
-typedef char MD5Context[88];
-
-// Computes the MD5 sum of the given data buffer with the given length.
-// The given 'digest' structure will be filled with the result data.
-BUTIL_EXPORT void MD5Sum(const void* data, size_t length, MD5Digest* digest);
-
-// Initializes the given MD5 context structure for subsequent calls to
-// MD5Update().
-BUTIL_EXPORT void MD5Init(MD5Context* context);
-
-// For the given buffer of |data| as a StringPiece, updates the given MD5
-// context with the sum of the data. You can call this any number of times
-// during the computation, except that MD5Init() must have been called first.
-BUTIL_EXPORT void MD5Update(MD5Context* context, const StringPiece& data);
-
-// Finalizes the MD5 operation and fills the buffer with the digest.
-BUTIL_EXPORT void MD5Final(MD5Digest* digest, MD5Context* context);
-
-// MD5IntermediateFinal() generates a digest without finalizing the MD5
-// operation.  Can be used to generate digests for the input seen thus far,
-// without affecting the digest generated for the entire input.
-BUTIL_EXPORT void MD5IntermediateFinal(MD5Digest* digest,
-                                      const MD5Context* context);
-
-// Converts a digest into human-readable hexadecimal.
-BUTIL_EXPORT std::string MD5DigestToBase16(const MD5Digest& digest);
-
-// Returns the MD5 (in hexadecimal) of a string.
-BUTIL_EXPORT std::string MD5String(const StringPiece& str);
-
-}  // namespace butil
-
-#endif  // BUTIL_MD5_H_

test/BUILD

@@ -83,7 +83,6 @@ TEST_BUTIL_SOURCES = [
     "guid_unittest.cc",
     "hash_unittest.cc",
     "lazy_instance_unittest.cc",
-    "md5_unittest.cc",
     "aligned_memory_unittest.cc",
     "linked_ptr_unittest.cc",
     "ref_counted_memory_unittest.cc",

test/CMakeLists.txt

@@ -100,7 +100,6 @@ SET(TEST_BUTIL_SOURCES
     ${PROJECT_SOURCE_DIR}/test/guid_unittest.cc
     ${PROJECT_SOURCE_DIR}/test/hash_unittest.cc
     ${PROJECT_SOURCE_DIR}/test/lazy_instance_unittest.cc
-    ${PROJECT_SOURCE_DIR}/test/md5_unittest.cc
     ${PROJECT_SOURCE_DIR}/test/aligned_memory_unittest.cc
     ${PROJECT_SOURCE_DIR}/test/linked_ptr_unittest.cc
     ${PROJECT_SOURCE_DIR}/test/ref_counted_memory_unittest.cc

test/Makefile

@@ -68,7 +68,6 @@ TEST_BUTIL_SOURCES = \
     guid_unittest.cc \
     hash_unittest.cc \
     lazy_instance_unittest.cc \
-    md5_unittest.cc \
     aligned_memory_unittest.cc \
     linked_ptr_unittest.cc \
     ref_counted_memory_unittest.cc \

test/md5_unittest.cc

@@ -1,252 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <string.h>
-#include <string>
-
-#include "butil/basictypes.h"
-#include "butil/memory/scoped_ptr.h"
-#include "butil/md5.h"
-#include <gtest/gtest.h>
-
-namespace butil {
-
-TEST(MD5, DigestToBase16) {
-  MD5Digest digest;
-
-  int data[] = {
-    0xd4, 0x1d, 0x8c, 0xd9,
-    0x8f, 0x00, 0xb2, 0x04,
-    0xe9, 0x80, 0x09, 0x98,
-    0xec, 0xf8, 0x42, 0x7e
-  };
-
-  for (int i = 0; i < 16; ++i)
-    digest.a[i] = data[i] & 0xff;
-
-  std::string actual = MD5DigestToBase16(digest);
-  std::string expected = "d41d8cd98f00b204e9800998ecf8427e";
-
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5SumEmtpyData) {
-  MD5Digest digest;
-  const char* data = "";
-
-  MD5Sum(data, strlen(data), &digest);
-
-  int expected[] = {
-    0xd4, 0x1d, 0x8c, 0xd9,
-    0x8f, 0x00, 0xb2, 0x04,
-    0xe9, 0x80, 0x09, 0x98,
-    0xec, 0xf8, 0x42, 0x7e
-  };
-
-  for (int i = 0; i < 16; ++i)
-    EXPECT_EQ(expected[i], digest.a[i] & 0xFF);
-}
-
-TEST(MD5, MD5SumOneByteData) {
-  MD5Digest digest;
-  const char* data = "a";
-
-  MD5Sum(data, strlen(data), &digest);
-
-  int expected[] = {
-    0x0c, 0xc1, 0x75, 0xb9,
-    0xc0, 0xf1, 0xb6, 0xa8,
-    0x31, 0xc3, 0x99, 0xe2,
-    0x69, 0x77, 0x26, 0x61
-  };
-
-  for (int i = 0; i < 16; ++i)
-    EXPECT_EQ(expected[i], digest.a[i] & 0xFF);
-}
-
-TEST(MD5, MD5SumLongData) {
-  const int length = 10 * 1024 * 1024 + 1;
-  scoped_ptr<char[]> data(new char[length]);
-
-  for (int i = 0; i < length; ++i)
-    data[i] = i & 0xFF;
-
-  MD5Digest digest;
-  MD5Sum(data.get(), length, &digest);
-
-  int expected[] = {
-    0x90, 0xbd, 0x6a, 0xd9,
-    0x0a, 0xce, 0xf5, 0xad,
-    0xaa, 0x92, 0x20, 0x3e,
-    0x21, 0xc7, 0xa1, 0x3e
-  };
-
-  for (int i = 0; i < 16; ++i)
-    EXPECT_EQ(expected[i], digest.a[i] & 0xFF);
-}
-
-TEST(MD5, ContextWithEmptyData) {
-  MD5Context ctx;
-  MD5Init(&ctx);
-
-  MD5Digest digest;
-  MD5Final(&digest, &ctx);
-
-  int expected[] = {
-    0xd4, 0x1d, 0x8c, 0xd9,
-    0x8f, 0x00, 0xb2, 0x04,
-    0xe9, 0x80, 0x09, 0x98,
-    0xec, 0xf8, 0x42, 0x7e
-  };
-
-  for (int i = 0; i < 16; ++i)
-    EXPECT_EQ(expected[i], digest.a[i] & 0xFF);
-}
-
-TEST(MD5, ContextWithLongData) {
-  MD5Context ctx;
-  MD5Init(&ctx);
-
-  const int length = 10 * 1024 * 1024 + 1;
-  scoped_ptr<char[]> data(new char[length]);
-
-  for (int i = 0; i < length; ++i)
-    data[i] = i & 0xFF;
-
-  int total = 0;
-  while (total < length) {
-    int len = 4097;  // intentionally not 2^k.
-    if (len > length - total)
-      len = length - total;
-
-    MD5Update(&ctx,
-              StringPiece(reinterpret_cast<char*>(data.get() + total), len));
-    total += len;
-  }
-
-  EXPECT_EQ(length, total);
-
-  MD5Digest digest;
-  MD5Final(&digest, &ctx);
-
-  int expected[] = {
-    0x90, 0xbd, 0x6a, 0xd9,
-    0x0a, 0xce, 0xf5, 0xad,
-    0xaa, 0x92, 0x20, 0x3e,
-    0x21, 0xc7, 0xa1, 0x3e
-  };
-
-  for (int i = 0; i < 16; ++i)
-    EXPECT_EQ(expected[i], digest.a[i] & 0xFF);
-}
-
-// Example data from http://www.ietf.org/rfc/rfc1321.txt A.5 Test Suite
-TEST(MD5, MD5StringTestSuite1) {
-  std::string actual = MD5String("");
-  std::string expected = "d41d8cd98f00b204e9800998ecf8427e";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5StringTestSuite2) {
-  std::string actual = MD5String("a");
-  std::string expected = "0cc175b9c0f1b6a831c399e269772661";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5StringTestSuite3) {
-  std::string actual = MD5String("abc");
-  std::string expected = "900150983cd24fb0d6963f7d28e17f72";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5StringTestSuite4) {
-  std::string actual = MD5String("message digest");
-  std::string expected = "f96b697d7cb7938d525a2f31aaf161d0";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5StringTestSuite5) {
-  std::string actual = MD5String("abcdefghijklmnopqrstuvwxyz");
-  std::string expected = "c3fcd3d76192e4007dfb496cca67e13b";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5StringTestSuite6) {
-  std::string actual = MD5String("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                 "abcdefghijklmnopqrstuvwxyz"
-                                 "0123456789");
-  std::string expected = "d174ab98d277d9f5a5611c2c9f419d9f";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, MD5StringTestSuite7) {
-  std::string actual = MD5String("12345678901234567890"
-                                 "12345678901234567890"
-                                 "12345678901234567890"
-                                 "12345678901234567890");
-  std::string expected = "57edf4a22be3c955ac49da2e2107b67a";
-  EXPECT_EQ(expected, actual);
-}
-
-TEST(MD5, ContextWithStringData) {
-  MD5Context ctx;
-  MD5Init(&ctx);
-
-  MD5Update(&ctx, "abc");
-
-  MD5Digest digest;
-  MD5Final(&digest, &ctx);
-
-  std::string actual = MD5DigestToBase16(digest);
-  std::string expected = "900150983cd24fb0d6963f7d28e17f72";
-
-  EXPECT_EQ(expected, actual);
-}
-
-// Test that a digest generated by MD5IntermediateFinal() gives the same results
-// as an independently-calculated digest, and also does not modify the context.
-TEST(MD5, IntermediateFinal) {
-  // Independent context over the header.
-  MD5Context check_header_context;
-  MD5Init(&check_header_context);
-
-  // Independent context over entire input.
-  MD5Context check_full_context;
-  MD5Init(&check_full_context);
-
-  // Context intermediate digest will be calculated from.
-  MD5Context context;
-  MD5Init(&context);
-
-  static const char kHeader[] = "header data";
-  static const char kBody[] = "payload data";
-
-  MD5Update(&context, kHeader);
-  MD5Update(&check_header_context, kHeader);
-  MD5Update(&check_full_context, kHeader);
-
-  MD5Digest check_header_digest;
-  MD5Final(&check_header_digest, &check_header_context);
-
-  MD5Digest header_digest;
-  MD5IntermediateFinal(&header_digest, &context);
-
-  MD5Update(&context, kBody);
-  MD5Update(&check_full_context, kBody);
-
-  MD5Digest check_full_digest;
-  MD5Final(&check_full_digest, &check_full_context);
-
-  MD5Digest digest;
-  MD5Final(&digest, &context);
-
-  // The header and full digest pairs are the same, and they aren't the same as
-  // each other.
-  EXPECT_TRUE(!memcmp(&header_digest, &check_header_digest,
-                      sizeof(header_digest)));
-  EXPECT_TRUE(!memcmp(&digest, &check_full_digest, sizeof(digest)));
-  EXPECT_FALSE(!memcmp(&digest, &header_digest, sizeof(digest)));
-}
-
-}  // namespace butil