remove the crc64 implementation

CRC-64 has been added for map files. Now that the map file format has
been removed, there isn't a reason to keep the implementation.

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 766166467a8dfda405d06bbc8f0297b421bb83a0..22a92c484c904afcb110c2a3b1f72d649f6bac0d 100644 (file)
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -19,7 +19,6 @@
 #include <stdbool.h>
 
 #include <isc/assertions.h>
-#include <isc/crc64.h>
 #include <isc/lang.h>
 #include <isc/magic.h>
 #include <isc/refcount.h>

diff --git a/lib/dns/qpcache.c b/lib/dns/qpcache.c
index 16e5f1470eba627df8c2ef48ba813aabe9ae90bd..ca7a17029f859ee691909ed3e8cc72497693a91c 100644 (file)
--- a/lib/dns/qpcache.c
+++ b/lib/dns/qpcache.c
@@ -20,7 +20,6 @@
 #include <isc/ascii.h>
 #include <isc/async.h>
 #include <isc/atomic.h>
-#include <isc/crc64.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/hashmap.h>

diff --git a/lib/dns/qpzone.c b/lib/dns/qpzone.c
index 5a2b487ce1fd6e510097be54e4f13be55575b03d..64fbfc87948f2e0f48f63c58f1967983c62c191d 100644 (file)
--- a/lib/dns/qpzone.c
+++ b/lib/dns/qpzone.c
@@ -20,7 +20,6 @@
 #include <isc/ascii.h>
 #include <isc/async.h>
 #include <isc/atomic.h>
-#include <isc/crc64.h>
 #include <isc/file.h>
 #include <isc/heap.h>
 #include <isc/hex.h>

diff --git a/lib/dns/rbt-cachedb.c b/lib/dns/rbt-cachedb.c
index 1f252eaef484f251130bb4dcb535d94f66b0a88f..4e9f2e04088e0b7e0214f474a5ee4b864d12cb82 100644 (file)
--- a/lib/dns/rbt-cachedb.c
+++ b/lib/dns/rbt-cachedb.c
@@ -20,7 +20,6 @@
 #include <isc/ascii.h>
 #include <isc/async.h>
 #include <isc/atomic.h>
-#include <isc/crc64.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/hashmap.h>

diff --git a/lib/dns/rbt-zonedb.c b/lib/dns/rbt-zonedb.c
index 5f29bdafe58f534021d05a4063e6cf9a8a2a2511..5e8c2132c4130228f1b767db98a792aad12d0eed 100644 (file)
--- a/lib/dns/rbt-zonedb.c
+++ b/lib/dns/rbt-zonedb.c
@@ -20,7 +20,6 @@
 #include <isc/ascii.h>
 #include <isc/async.h>
 #include <isc/atomic.h>
-#include <isc/crc64.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/hashmap.h>

diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index e4b5b5d6efa3eb84ac183479fb043cefa4779693..bbda64eb5c045f263cb735029ae126899fbe3d18 100644 (file)
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -17,7 +17,6 @@
 #include <stdbool.h>
 #include <sys/stat.h>
 
-#include <isc/crc64.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/hex.h>

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 7c9e0f852c19f51ee3475ccfa60dcfd1b323487c..705fa98028efcb9e45f45ddc43e5d2a21559dea2 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -20,7 +20,6 @@
 #include <isc/ascii.h>
 #include <isc/async.h>
 #include <isc/atomic.h>
-#include <isc/crc64.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/hashmap.h>

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 8a84c407e2c7850a5732e429f1f84146edb0389a..8428ee771b779b7eb637d5e3e7ea8757825ad7c4 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -17,7 +17,6 @@ libisc_la_HEADERS =                   \
        include/isc/commandline.h       \
        include/isc/condition.h         \
        include/isc/counter.h           \
-       include/isc/crc64.h             \
        include/isc/dir.h               \
        include/isc/dnsstream.h         \
        include/isc/endian.h            \
@@ -124,7 +123,6 @@ libisc_la_SOURCES =         \
        commandline.c           \
        condition.c             \
        counter.c               \
-       crc64.c                 \
        dir.c                   \
        entropy.c               \
        errno.c                 \

diff --git a/lib/isc/crc64.c b/lib/isc/crc64.c
deleted file mode 100644 (file)
index 4b6c213..0000000
--- a/lib/isc/crc64.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * 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 https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#include <inttypes.h>
-
-#include <isc/assertions.h>
-#include <isc/crc64.h>
-#include <isc/string.h>
-#include <isc/types.h>
-#include <isc/util.h>
-
-/*%<
- * ECMA-182 CRC64 polynomial.
- */
-static const uint64_t crc64_table[256] = {
-       0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
-       0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
-       0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
-       0xD0962D61B56FEF2DULL, 0x17870F5D4F51B498ULL, 0x5577EEB6E6BB820BULL,
-       0xDB55AACF12C73561ULL, 0x99A54B24BB2D03F2ULL, 0x5EB4691841135847ULL,
-       0x1C4488F3E8F96ED4ULL, 0x663D78FF90E185EFULL, 0x24CD9914390BB37CULL,
-       0xE3DCBB28C335E8C9ULL, 0xA12C5AC36ADFDE5AULL, 0x2F0E1EBA9EA36930ULL,
-       0x6DFEFF5137495FA3ULL, 0xAAEFDD6DCD770416ULL, 0xE81F3C86649D3285ULL,
-       0xF45BB4758C645C51ULL, 0xB6AB559E258E6AC2ULL, 0x71BA77A2DFB03177ULL,
-       0x334A9649765A07E4ULL, 0xBD68D2308226B08EULL, 0xFF9833DB2BCC861DULL,
-       0x388911E7D1F2DDA8ULL, 0x7A79F00C7818EB3BULL, 0xCC7AF1FF21C30BDEULL,
-       0x8E8A101488293D4DULL, 0x499B3228721766F8ULL, 0x0B6BD3C3DBFD506BULL,
-       0x854997BA2F81E701ULL, 0xC7B97651866BD192ULL, 0x00A8546D7C558A27ULL,
-       0x4258B586D5BFBCB4ULL, 0x5E1C3D753D46D260ULL, 0x1CECDC9E94ACE4F3ULL,
-       0xDBFDFEA26E92BF46ULL, 0x990D1F49C77889D5ULL, 0x172F5B3033043EBFULL,
-       0x55DFBADB9AEE082CULL, 0x92CE98E760D05399ULL, 0xD03E790CC93A650AULL,
-       0xAA478900B1228E31ULL, 0xE8B768EB18C8B8A2ULL, 0x2FA64AD7E2F6E317ULL,
-       0x6D56AB3C4B1CD584ULL, 0xE374EF45BF6062EEULL, 0xA1840EAE168A547DULL,
-       0x66952C92ECB40FC8ULL, 0x2465CD79455E395BULL, 0x3821458AADA7578FULL,
-       0x7AD1A461044D611CULL, 0xBDC0865DFE733AA9ULL, 0xFF3067B657990C3AULL,
-       0x711223CFA3E5BB50ULL, 0x33E2C2240A0F8DC3ULL, 0xF4F3E018F031D676ULL,
-       0xB60301F359DBE0E5ULL, 0xDA050215EA6C212FULL, 0x98F5E3FE438617BCULL,
-       0x5FE4C1C2B9B84C09ULL, 0x1D14202910527A9AULL, 0x93366450E42ECDF0ULL,
-       0xD1C685BB4DC4FB63ULL, 0x16D7A787B7FAA0D6ULL, 0x5427466C1E109645ULL,
-       0x4863CE9FF6E9F891ULL, 0x0A932F745F03CE02ULL, 0xCD820D48A53D95B7ULL,
-       0x8F72ECA30CD7A324ULL, 0x0150A8DAF8AB144EULL, 0x43A04931514122DDULL,
-       0x84B16B0DAB7F7968ULL, 0xC6418AE602954FFBULL, 0xBC387AEA7A8DA4C0ULL,
-       0xFEC89B01D3679253ULL, 0x39D9B93D2959C9E6ULL, 0x7B2958D680B3FF75ULL,
-       0xF50B1CAF74CF481FULL, 0xB7FBFD44DD257E8CULL, 0x70EADF78271B2539ULL,
-       0x321A3E938EF113AAULL, 0x2E5EB66066087D7EULL, 0x6CAE578BCFE24BEDULL,
-       0xABBF75B735DC1058ULL, 0xE94F945C9C3626CBULL, 0x676DD025684A91A1ULL,
-       0x259D31CEC1A0A732ULL, 0xE28C13F23B9EFC87ULL, 0xA07CF2199274CA14ULL,
-       0x167FF3EACBAF2AF1ULL, 0x548F120162451C62ULL, 0x939E303D987B47D7ULL,
-       0xD16ED1D631917144ULL, 0x5F4C95AFC5EDC62EULL, 0x1DBC74446C07F0BDULL,
-       0xDAAD56789639AB08ULL, 0x985DB7933FD39D9BULL, 0x84193F60D72AF34FULL,
-       0xC6E9DE8B7EC0C5DCULL, 0x01F8FCB784FE9E69ULL, 0x43081D5C2D14A8FAULL,
-       0xCD2A5925D9681F90ULL, 0x8FDAB8CE70822903ULL, 0x48CB9AF28ABC72B6ULL,
-       0x0A3B7B1923564425ULL, 0x70428B155B4EAF1EULL, 0x32B26AFEF2A4998DULL,
-       0xF5A348C2089AC238ULL, 0xB753A929A170F4ABULL, 0x3971ED50550C43C1ULL,
-       0x7B810CBBFCE67552ULL, 0xBC902E8706D82EE7ULL, 0xFE60CF6CAF321874ULL,
-       0xE224479F47CB76A0ULL, 0xA0D4A674EE214033ULL, 0x67C58448141F1B86ULL,
-       0x253565A3BDF52D15ULL, 0xAB1721DA49899A7FULL, 0xE9E7C031E063ACECULL,
-       0x2EF6E20D1A5DF759ULL, 0x6C0603E6B3B7C1CAULL, 0xF6FAE5C07D3274CDULL,
-       0xB40A042BD4D8425EULL, 0x731B26172EE619EBULL, 0x31EBC7FC870C2F78ULL,
-       0xBFC9838573709812ULL, 0xFD39626EDA9AAE81ULL, 0x3A28405220A4F534ULL,
-       0x78D8A1B9894EC3A7ULL, 0x649C294A61B7AD73ULL, 0x266CC8A1C85D9BE0ULL,
-       0xE17DEA9D3263C055ULL, 0xA38D0B769B89F6C6ULL, 0x2DAF4F0F6FF541ACULL,
-       0x6F5FAEE4C61F773FULL, 0xA84E8CD83C212C8AULL, 0xEABE6D3395CB1A19ULL,
-       0x90C79D3FEDD3F122ULL, 0xD2377CD44439C7B1ULL, 0x15265EE8BE079C04ULL,
-       0x57D6BF0317EDAA97ULL, 0xD9F4FB7AE3911DFDULL, 0x9B041A914A7B2B6EULL,
-       0x5C1538ADB04570DBULL, 0x1EE5D94619AF4648ULL, 0x02A151B5F156289CULL,
-       0x4051B05E58BC1E0FULL, 0x87409262A28245BAULL, 0xC5B073890B687329ULL,
-       0x4B9237F0FF14C443ULL, 0x0962D61B56FEF2D0ULL, 0xCE73F427ACC0A965ULL,
-       0x8C8315CC052A9FF6ULL, 0x3A80143F5CF17F13ULL, 0x7870F5D4F51B4980ULL,
-       0xBF61D7E80F251235ULL, 0xFD913603A6CF24A6ULL, 0x73B3727A52B393CCULL,
-       0x31439391FB59A55FULL, 0xF652B1AD0167FEEAULL, 0xB4A25046A88DC879ULL,
-       0xA8E6D8B54074A6ADULL, 0xEA16395EE99E903EULL, 0x2D071B6213A0CB8BULL,
-       0x6FF7FA89BA4AFD18ULL, 0xE1D5BEF04E364A72ULL, 0xA3255F1BE7DC7CE1ULL,
-       0x64347D271DE22754ULL, 0x26C49CCCB40811C7ULL, 0x5CBD6CC0CC10FAFCULL,
-       0x1E4D8D2B65FACC6FULL, 0xD95CAF179FC497DAULL, 0x9BAC4EFC362EA149ULL,
-       0x158E0A85C2521623ULL, 0x577EEB6E6BB820B0ULL, 0x906FC95291867B05ULL,
-       0xD29F28B9386C4D96ULL, 0xCEDBA04AD0952342ULL, 0x8C2B41A1797F15D1ULL,
-       0x4B3A639D83414E64ULL, 0x09CA82762AAB78F7ULL, 0x87E8C60FDED7CF9DULL,
-       0xC51827E4773DF90EULL, 0x020905D88D03A2BBULL, 0x40F9E43324E99428ULL,
-       0x2CFFE7D5975E55E2ULL, 0x6E0F063E3EB46371ULL, 0xA91E2402C48A38C4ULL,
-       0xEBEEC5E96D600E57ULL, 0x65CC8190991CB93DULL, 0x273C607B30F68FAEULL,
-       0xE02D4247CAC8D41BULL, 0xA2DDA3AC6322E288ULL, 0xBE992B5F8BDB8C5CULL,
-       0xFC69CAB42231BACFULL, 0x3B78E888D80FE17AULL, 0x7988096371E5D7E9ULL,
-       0xF7AA4D1A85996083ULL, 0xB55AACF12C735610ULL, 0x724B8ECDD64D0DA5ULL,
-       0x30BB6F267FA73B36ULL, 0x4AC29F2A07BFD00DULL, 0x08327EC1AE55E69EULL,
-       0xCF235CFD546BBD2BULL, 0x8DD3BD16FD818BB8ULL, 0x03F1F96F09FD3CD2ULL,
-       0x41011884A0170A41ULL, 0x86103AB85A2951F4ULL, 0xC4E0DB53F3C36767ULL,
-       0xD8A453A01B3A09B3ULL, 0x9A54B24BB2D03F20ULL, 0x5D45907748EE6495ULL,
-       0x1FB5719CE1045206ULL, 0x919735E51578E56CULL, 0xD367D40EBC92D3FFULL,
-       0x1476F63246AC884AULL, 0x568617D9EF46BED9ULL, 0xE085162AB69D5E3CULL,
-       0xA275F7C11F7768AFULL, 0x6564D5FDE549331AULL, 0x279434164CA30589ULL,
-       0xA9B6706FB8DFB2E3ULL, 0xEB46918411358470ULL, 0x2C57B3B8EB0BDFC5ULL,
-       0x6EA7525342E1E956ULL, 0x72E3DAA0AA188782ULL, 0x30133B4B03F2B111ULL,
-       0xF7021977F9CCEAA4ULL, 0xB5F2F89C5026DC37ULL, 0x3BD0BCE5A45A6B5DULL,
-       0x79205D0E0DB05DCEULL, 0xBE317F32F78E067BULL, 0xFCC19ED95E6430E8ULL,
-       0x86B86ED5267CDBD3ULL, 0xC4488F3E8F96ED40ULL, 0x0359AD0275A8B6F5ULL,
-       0x41A94CE9DC428066ULL, 0xCF8B0890283E370CULL, 0x8D7BE97B81D4019FULL,
-       0x4A6ACB477BEA5A2AULL, 0x089A2AACD2006CB9ULL, 0x14DEA25F3AF9026DULL,
-       0x562E43B4931334FEULL, 0x913F6188692D6F4BULL, 0xD3CF8063C0C759D8ULL,
-       0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
-       0x9AFCE626CE85B507ULL
-};
-
-void
-isc_crc64_init(uint64_t *crc) {
-       REQUIRE(crc != NULL);
-
-       *crc = 0xffffffffffffffffULL;
-}
-
-void
-isc_crc64_update(uint64_t *crc, const void *data, size_t len) {
-       const unsigned char *p = data;
-       int i;
-
-       REQUIRE(crc != NULL);
-       REQUIRE(data != NULL);
-
-       while (len-- > 0U) {
-               i = ((int)(*crc >> 56) ^ *p++) & 0xff;
-               *crc = crc64_table[i] ^ (*crc << 8);
-       }
-}
-
-void
-isc_crc64_final(uint64_t *crc) {
-       REQUIRE(crc != NULL);
-
-       *crc ^= 0xffffffffffffffffULL;
-}

diff --git a/lib/isc/include/isc/crc64.h b/lib/isc/include/isc/crc64.h
deleted file mode 100644 (file)
index 4147672..0000000
--- a/lib/isc/include/isc/crc64.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * 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 https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#pragma once
-
-/*! \file isc/crc64.h
- * \brief CRC64 in C
- */
-
-#include <inttypes.h>
-
-#include <isc/lang.h>
-#include <isc/types.h>
-
-ISC_LANG_BEGINDECLS
-
-void
-isc_crc64_init(uint64_t *crc);
-/*%
- * Initialize a new CRC.
- *
- * Requires:
- * * 'crc' is not NULL.
- */
-
-void
-isc_crc64_update(uint64_t *crc, const void *data, size_t len);
-/*%
- * Add data to the CRC.
- *
- * Requires:
- * * 'crc' is not NULL.
- * * 'data' is not NULL.
- */
-
-void
-isc_crc64_final(uint64_t *crc);
-/*%
- * Finalize the CRC.
- *
- * Requires:
- * * 'crc' is not NULL.
- */
-
-ISC_LANG_ENDDECLS

diff --git a/tests/isc/Makefile.am b/tests/isc/Makefile.am
index e8132127047aea69670096206e9f28953543e50c..5049a88e77d59f2a604b70bc48126d640e774468 100644 (file)
--- a/tests/isc/Makefile.am
+++ b/tests/isc/Makefile.am
@@ -16,7 +16,6 @@ check_PROGRAMS =      \
        async_test      \
        buffer_test     \
        counter_test    \
-       crc64_test      \
        dnsstream_utils_test \
        errno_test      \
        file_test       \

diff --git a/tests/isc/crc64_test.c b/tests/isc/crc64_test.c
deleted file mode 100644 (file)
index a652dd5..0000000
--- a/tests/isc/crc64_test.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * 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 https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/* ! \file */
-
-#include <inttypes.h>
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/crc64.h>
-#include <isc/result.h>
-#include <isc/util.h>
-
-#include <tests/isc.h>
-
-#define TEST_INPUT(x) (x), sizeof(x) - 1
-
-ISC_RUN_TEST_IMPL(isc_crc64_init) {
-       uint64_t crc;
-
-       isc_crc64_init(&crc);
-       assert_int_equal(crc, 0xffffffffffffffffUL);
-}
-
-static void
-_crc64(const char *buf, size_t buflen, const char *result, const int repeats) {
-       uint64_t crc;
-
-       isc_crc64_init(&crc);
-       assert_int_equal(crc, 0xffffffffffffffffUL);
-
-       for (int i = 0; i < repeats; i++) {
-               isc_crc64_update(&crc, buf, buflen);
-       }
-
-       isc_crc64_final(&crc);
-
-       char hex[16 + 1];
-       snprintf(hex, sizeof(hex), "%016" PRIX64, crc);
-
-       assert_memory_equal(hex, result, (result ? strlen(result) : 0));
-}
-
-/* 64-bit cyclic redundancy check */
-ISC_RUN_TEST_IMPL(isc_crc64) {
-       _crc64(TEST_INPUT(""), "0000000000000000", 1);
-       _crc64(TEST_INPUT("a"), "CE73F427ACC0A99A", 1);
-       _crc64(TEST_INPUT("abc"), "048B813AF9F49702", 1);
-       _crc64(TEST_INPUT("message digest"), "5273F9EA7A357BF4", 1);
-       _crc64(TEST_INPUT("abcdefghijklmnopqrstuvwxyz"), "59F079F9218BAAA1", 1);
-       _crc64(TEST_INPUT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklm"
-                         "nopqrstuvwxyz0123456789"),
-              "A36DA8F71E78B6FB", 1);
-       _crc64(TEST_INPUT("123456789012345678901234567890123456789"
-                         "01234567890123456789012345678901234567890"),
-              "81E5EB73C8E7874A", 1);
-}
-
-ISC_TEST_LIST_START
-
-ISC_TEST_ENTRY(isc_crc64_init)
-ISC_TEST_ENTRY(isc_crc64)
-
-ISC_TEST_LIST_END
-
-ISC_TEST_MAIN