Skip to content

B
brpc
Commit 86ca8af3 authored by jamesge's avatar jamesge
Browse files
Options

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

parent bb29ab6a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 333 deletions
BUILD
View file @ 86ca8af3
......@@ -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
View file @ 86ca8af3
......@@ -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
View file @ 86ca8af3
......@@ -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 deleted 100644 → 0
View file @ bb29ab6a
This diff is collapsed.
src/butil/md5.h deleted 100644 → 0
View file @ bb29ab6a
// 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
View file @ 86ca8af3
......@@ -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
View file @ 86ca8af3
......@@ -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
View file @ 86ca8af3
......@@ -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 deleted 100644 → 0
View file @ bb29ab6a
// 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment