From 237ef6d210a0370131deb58277e77d579d58d15a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 17 Jan 2020 14:35:04 +0100 Subject: Remove CRC-16 implementation --- apt-pkg/contrib/crc-16.cc | 77 -------------------------------------------- apt-pkg/contrib/crc-16.h | 19 ----------- apt-pkg/deb/deblistparser.cc | 1 - debian/libapt-pkg6.0.symbols | 2 -- 4 files changed, 99 deletions(-) delete mode 100644 apt-pkg/contrib/crc-16.cc delete mode 100644 apt-pkg/contrib/crc-16.h diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc deleted file mode 100644 index 2e396ab78..000000000 --- a/apt-pkg/contrib/crc-16.cc +++ /dev/null @@ -1,77 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - CRC16 - Compute a 16bit crc very quickly - - This was ripped out of the linux 2.2 kernel source (irda/crc.c) and - is credited to ppp.c by Michael Callahan and - Al Longyear - - Modified by Jason Gunthorpe to fit the local coding - style, this code is believed to be in the Public Domain. - - ##################################################################### */ - /*}}}*/ -// Include Files /*{{{*/ -#include - -#include - /*}}}*/ - -/* - * This mysterious table is just the CRC of each possible byte. It can be - * computed using the standard bit-at-a-time methods. The polynomial can - * be seen in entry 128, 0x8408. This corresponds to x^0 + x^5 + x^12. - * Add the implicit x^16, and you have the standard CRC-CCITT. - */ -static unsigned short const crc16_table[256] = -{ - 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, - 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7, - 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e, - 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876, - 0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd, - 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5, - 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c, - 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974, - 0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb, - 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3, - 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a, - 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72, - 0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9, - 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1, - 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738, - 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70, - 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7, - 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff, - 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036, - 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e, - 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5, - 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd, - 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134, - 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c, - 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3, - 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb, - 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232, - 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a, - 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1, - 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9, - 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330, - 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78 -}; - -/* Recompute the FCS with one more character appended. */ -#define CalcFCS(fcs, c) (((fcs) >> 8) ^ crc16_table[((fcs) ^ (c)) & 0xff]) -unsigned short AddCRC16Byte(unsigned short fcs, unsigned char byte) -{ - return CalcFCS(fcs, byte); -} -unsigned short AddCRC16(unsigned short fcs, void const *Buf, - unsigned long long len) -{ - unsigned char const *buf = (unsigned char const *)Buf; - while (len--) - fcs = CalcFCS(fcs, *buf++); - return fcs; -} diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h deleted file mode 100644 index 3e0756007..000000000 --- a/apt-pkg/contrib/crc-16.h +++ /dev/null @@ -1,19 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -/* ###################################################################### - - CRC16 - Compute a 16bit crc very quickly - - ##################################################################### */ - /*}}}*/ -#ifndef APTPKG_CRC16_H -#define APTPKG_CRC16_H - -#include - -#define INIT_FCS 0xffff -unsigned short AddCRC16Byte(unsigned short fcs, unsigned char byte) APT_PURE; -unsigned short AddCRC16(unsigned short fcs, void const *buf, - unsigned long long len) APT_PURE; - -#endif diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 33c83f8f0..eaa9dfda9 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols index a533cdc62..af66bf981 100644 --- a/debian/libapt-pkg6.0.symbols +++ b/debian/libapt-pkg6.0.symbols @@ -667,7 +667,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@APTPKG_6.0" 0.8.16~exp6 (c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@APTPKG_6.0" 0.8.16~exp6 ### generalisation of checksums (with lfs) -- mostly api-compatible available (without sha512 in previous versions) - (c++)"AddCRC16(unsigned short, void const*, unsigned long long)@APTPKG_6.0" 0.8.16~exp2 (c++)"MD5Summation::Add(unsigned char const*, unsigned long long)@APTPKG_6.0" 0.8.16~exp6 (c++)"MD5Summation::Result()@APTPKG_6.0" 0.8.16~exp2 (c++)"MD5Summation::MD5Summation()@APTPKG_6.0" 0.8.16~exp2 @@ -1428,7 +1427,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# (c++)"void std::vector >::emplace_back(pkgDPkgPM::Item::Ops&&, pkgCache::PkgIterator&)@APTPKG_6.0" 1.3~rc2 (c++)"void std::vector, std::allocator >, std::allocator, std::allocator > > >::emplace_back, std::allocator > const&>(std::__cxx11::basic_string, std::allocator > const&)@APTPKG_6.0" 1.3~rc2 (c++)"void std::vector, std::allocator > >, std::allocator, std::allocator > > > >::emplace_back, std::allocator > >(pkgDPkgPM::Item*&&, std::__cxx11::basic_string, std::allocator >&&)@APTPKG_6.0" 1.3~rc2 - (c++)"AddCRC16Byte(unsigned short, unsigned char)@APTPKG_6.0" 1.4~beta1 (c++)"APT::String::Join(std::vector, std::allocator >, std::allocator, std::allocator > > >, std::__cxx11::basic_string, std::allocator > const&)@APTPKG_6.0" 1.4~beta4 (c++)"debListParser::ParseDepends(char const*, char const*, std::__cxx11::basic_string, std::allocator >&, std::__cxx11::basic_string, std::allocator >&, unsigned int&, bool const&, bool const&, bool const&, std::__cxx11::basic_string, std::allocator > const&)@APTPKG_6.0" 1.4~beta3 (c++)"debListParser::ParseDepends(char const*, char const*, APT::StringView&, APT::StringView&, unsigned int&, bool, bool, bool, std::__cxx11::basic_string, std::allocator >)@APTPKG_6.0" 1.9.0~ -- cgit v1.2.3