From d93f9d1b28b7e8cf6bdcbc25ba323a0eab17b234 Mon Sep 17 00:00:00 2001 From: Cykesiopka Date: Mon, 27 Jun 2016 09:06:51 -0700 Subject: [PATCH] Bug 1282004 - Convert TestMD4 CPP unit test into a GTest. r=mgoodwin Nothing in the file requires functionality provided by the CPP unit test harness, so making the file a GTest makes it more accessible. MozReview-Commit-ID: FaAtF0blCwV --HG-- rename : security/manager/ssl/tests/compiled/TestMD4.cpp => security/manager/ssl/tests/gtest/MD4Test.cpp extra : transplant_source : edV%1F%0B97%1B%25%FA%0ABH%14%F5%A2Ms/%7E --- .../manager/ssl/tests/compiled/TestMD4.cpp | 72 ------------------ security/manager/ssl/tests/compiled/moz.build | 5 -- security/manager/ssl/tests/gtest/MD4Test.cpp | 76 +++++++++++++++++++ security/manager/ssl/tests/gtest/moz.build | 1 + testing/cppunittest.ini | 1 - 5 files changed, 77 insertions(+), 78 deletions(-) delete mode 100644 security/manager/ssl/tests/compiled/TestMD4.cpp create mode 100644 security/manager/ssl/tests/gtest/MD4Test.cpp diff --git a/security/manager/ssl/tests/compiled/TestMD4.cpp b/security/manager/ssl/tests/compiled/TestMD4.cpp deleted file mode 100644 index 69d4bd83aab9..000000000000 --- a/security/manager/ssl/tests/compiled/TestMD4.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "TestHarness.h" -#include "md4.h" -#include "mozilla/Casting.h" - -// The md4 implementation isn't built as a separate library. This is the easiest -// way to expose the symbols necessary to test the implementation. -#include "md4.c" - -struct rfc1320_test_value { - const char* data; - const uint8_t md4[16]; -}; - -nsresult -TestMD4() -{ - rfc1320_test_value rfc1320_test_values[] = { - { - "", - { 0x31, 0xd6, 0xcf, 0xe0, 0xd1, 0x6a, 0xe9, 0x31, 0xb7, 0x3c, 0x59, 0xd7, 0xe0, 0xc0, 0x89, 0xc0 } - }, - { - "a", - { 0xbd, 0xe5, 0x2c, 0xb3, 0x1d, 0xe3, 0x3e, 0x46, 0x24, 0x5e, 0x05, 0xfb, 0xdb, 0xd6, 0xfb, 0x24 } - }, - { - "abc", - { 0xa4, 0x48, 0x01, 0x7a, 0xaf, 0x21, 0xd8, 0x52, 0x5f, 0xc1, 0x0a, 0xe8, 0x7a, 0xa6, 0x72, 0x9d } - }, - { - "message digest", - { 0xd9, 0x13, 0x0a, 0x81, 0x64, 0x54, 0x9f, 0xe8, 0x18, 0x87, 0x48, 0x06, 0xe1, 0xc7, 0x01, 0x4b } - }, - { - "abcdefghijklmnopqrstuvwxyz", - { 0xd7, 0x9e, 0x1c, 0x30, 0x8a, 0xa5, 0xbb, 0xcd, 0xee, 0xa8, 0xed, 0x63, 0xdf, 0x41, 0x2d, 0xa9 }, - }, - { - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", - { 0x04, 0x3f, 0x85, 0x82, 0xf2, 0x41, 0xdb, 0x35, 0x1c, 0xe6, 0x27, 0xe1, 0x53, 0xe7, 0xf0, 0xe4 }, - }, - { - "12345678901234567890123456789012345678901234567890123456789012345678901234567890", - { 0xe3, 0x3b, 0x4d, 0xdc, 0x9c, 0x38, 0xf2, 0x19, 0x9c, 0x3e, 0x7b, 0x16, 0x4f, 0xcc, 0x05, 0x36 }, - } - }; - - for (size_t i = 0; i < MOZ_ARRAY_LENGTH(rfc1320_test_values); i++) { - uint8_t md4_result[16]; - md4sum(mozilla::BitwiseCast( - rfc1320_test_values[i].data), - strlen(rfc1320_test_values[i].data), md4_result); - if (memcmp(md4_result, rfc1320_test_values[i].md4, 16) != 0) { - fail("MD4 comparison test value #%d from RFC1320 failed", i + 1); - return NS_ERROR_FAILURE; - } - passed("MD4 comparison test value #%d from RFC1320 passed", i + 1); - } - return NS_OK; -} - -int -main(int argc, char* argv[]) -{ - return NS_FAILED(TestMD4()) ? 1 : 0; -} diff --git a/security/manager/ssl/tests/compiled/moz.build b/security/manager/ssl/tests/compiled/moz.build index 07e5d0d1f9a6..a677c2dd81d5 100644 --- a/security/manager/ssl/tests/compiled/moz.build +++ b/security/manager/ssl/tests/compiled/moz.build @@ -9,13 +9,8 @@ CppUnitTests([ 'TestSTSParser', ]) -LOCAL_INCLUDES += [ - '/security/manager/ssl/', -] - GeckoCppUnitTests([ 'TestCertDB', - 'TestMD4', ]) USE_LIBS += [ diff --git a/security/manager/ssl/tests/gtest/MD4Test.cpp b/security/manager/ssl/tests/gtest/MD4Test.cpp new file mode 100644 index 000000000000..1b635a757b03 --- /dev/null +++ b/security/manager/ssl/tests/gtest/MD4Test.cpp @@ -0,0 +1,76 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// This file tests the md4.c implementation. + +#include "gtest/gtest.h" +#include "md4.h" +#include "mozilla/Casting.h" +#include "mozilla/PodOperations.h" + +struct RFC1320TestParams +{ + const char* data; + const uint8_t expectedHash[16]; +}; + +static const RFC1320TestParams RFC1320_TEST_PARAMS[] = +{ + { + "", + { 0x31, 0xd6, 0xcf, 0xe0, 0xd1, 0x6a, 0xe9, 0x31, + 0xb7, 0x3c, 0x59, 0xd7, 0xe0, 0xc0, 0x89, 0xc0 } + }, + { + "a", + { 0xbd, 0xe5, 0x2c, 0xb3, 0x1d, 0xe3, 0x3e, 0x46, + 0x24, 0x5e, 0x05, 0xfb, 0xdb, 0xd6, 0xfb, 0x24 } + }, + { + "abc", + { 0xa4, 0x48, 0x01, 0x7a, 0xaf, 0x21, 0xd8, 0x52, + 0x5f, 0xc1, 0x0a, 0xe8, 0x7a, 0xa6, 0x72, 0x9d } + }, + { + "message digest", + { 0xd9, 0x13, 0x0a, 0x81, 0x64, 0x54, 0x9f, 0xe8, + 0x18, 0x87, 0x48, 0x06, 0xe1, 0xc7, 0x01, 0x4b } + }, + { + "abcdefghijklmnopqrstuvwxyz", + { 0xd7, 0x9e, 0x1c, 0x30, 0x8a, 0xa5, 0xbb, 0xcd, + 0xee, 0xa8, 0xed, 0x63, 0xdf, 0x41, 0x2d, 0xa9 }, + }, + { + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", + { 0x04, 0x3f, 0x85, 0x82, 0xf2, 0x41, 0xdb, 0x35, + 0x1c, 0xe6, 0x27, 0xe1, 0x53, 0xe7, 0xf0, 0xe4 }, + }, + { + "12345678901234567890123456789012345678901234567890123456789012345678901234567890", + { 0xe3, 0x3b, 0x4d, 0xdc, 0x9c, 0x38, 0xf2, 0x19, + 0x9c, 0x3e, 0x7b, 0x16, 0x4f, 0xcc, 0x05, 0x36 }, + } +}; + +class psm_MD4 + : public ::testing::Test + , public ::testing::WithParamInterface +{ +}; + +TEST_P(psm_MD4, RFC1320TestValues) +{ + const RFC1320TestParams& params(GetParam()); + uint8_t actualHash[16]; + md4sum(mozilla::BitwiseCast(params.data), + strlen(params.data), actualHash); + EXPECT_TRUE(mozilla::PodEqual(actualHash, params.expectedHash)) + << "MD4 hashes aren't equal for input: '" << params.data << "'"; +} + +INSTANTIATE_TEST_CASE_P(psm_MD4, psm_MD4, + testing::ValuesIn(RFC1320_TEST_PARAMS)); diff --git a/security/manager/ssl/tests/gtest/moz.build b/security/manager/ssl/tests/gtest/moz.build index 732fdcdf8962..24d2c35da87d 100644 --- a/security/manager/ssl/tests/gtest/moz.build +++ b/security/manager/ssl/tests/gtest/moz.build @@ -7,6 +7,7 @@ SOURCES += [ 'DataStorageTest.cpp', 'DeserializeCertTest.cpp', + 'MD4Test.cpp', 'OCSPCacheTest.cpp', 'TLSIntoleranceTest.cpp', ] diff --git a/testing/cppunittest.ini b/testing/cppunittest.ini index 8f2894527425..bf2b630708e1 100644 --- a/testing/cppunittest.ini +++ b/testing/cppunittest.ini @@ -49,7 +49,6 @@ skip-if = os == 'android' # bug 1228175, bug 929655 [TestJemalloc] [TestLineBreak] [TestLinkedList] -[TestMD4] [TestMacroArgs] [TestMacroForEach] [TestMathAlgorithms]