10 files changed, 19 insertions, 298 deletions
diff --git a/gr-digital/include/gnuradio/digital/CMakeLists.txt b/gr-digital/include/gnuradio/digital/CMakeLists.txt
index e60e5a0175..4d50ecedb2 100644
--- a/gr-digital/include/gnuradio/digital/CMakeLists.txt
+++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt
@@ -33,7 +33,6 @@ install(FILES
     correlate_access_code_ff_ts.h
     costas_loop_cc.h
     cpmmod_bc.h
-    crc32.h
     crc32_bb.h
     crc32_async_bb.h
     decision_feedback_equalizer.h
diff --git a/gr-digital/include/gnuradio/digital/crc32.h b/gr-digital/include/gnuradio/digital/crc32.h
deleted file mode 100644
index bce76b7a76..0000000000
--- a/gr-digital/include/gnuradio/digital/crc32.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2011,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-#ifndef INCLUDED_DIGITAL_CRC32_H
-#define INCLUDED_DIGITAL_CRC32_H
-
-#include <gnuradio/digital/api.h>
-#include <gnuradio/types.h>
-#include <string>
-
-namespace gr {
-namespace digital {
-
-/*!
- * \brief update running CRC-32
- * \ingroup packet_operators_blk
- *
- * \details
- * Update a running CRC with the bytes buf[0..len-1] The CRC
- * should be initialized to all 1's, and the transmitted value is
- * the 1's complement of the final running CRC.  The resulting CRC
- * should be transmitted in big endian order.
- */
-DIGITAL_API unsigned int
-update_crc32(unsigned int crc, const unsigned char* buf, size_t len);
-
-DIGITAL_API unsigned int update_crc32(unsigned int crc, const std::string buf);
-
-DIGITAL_API unsigned int crc32(const unsigned char* buf, size_t len);
-
-DIGITAL_API unsigned int crc32(const std::string buf);
-
-} /* namespace digital */
-} /* namespace gr */
-
-#endif /* INCLUDED_CRC32_H */
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index b3d81ce506..9a39a85267 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -30,7 +30,6 @@ add_library(gnuradio-digital
     correlate_access_code_ff_ts_impl.cc
     costas_loop_cc_impl.cc
     cpmmod_bc_impl.cc
-    crc32.cc
     crc32_bb_impl.cc
     crc32_async_bb_impl.cc
     decision_feedback_equalizer_impl.cc
diff --git a/gr-digital/lib/crc32.cc b/gr-digital/lib/crc32.cc
deleted file mode 100644
index 9bb6935253..0000000000
--- a/gr-digital/lib/crc32.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2005,2011,2012 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-/*
- * See also ISO 3309 [ISO-3309] or ITU-T V.42 [ITU-V42] for a formal specification.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnuradio/digital/crc32.h>
-
-namespace gr {
-namespace digital {
-
-// Automatically generated CRC function
-// polynomial: 0x104C11DB7
-unsigned int update_crc32(unsigned int crc, const unsigned char* data, size_t len)
-{
-    static const unsigned int table[256] = {
-        0x00000000U, 0x04C11DB7U, 0x09823B6EU, 0x0D4326D9U, 0x130476DCU, 0x17C56B6BU,
-        0x1A864DB2U, 0x1E475005U, 0x2608EDB8U, 0x22C9F00FU, 0x2F8AD6D6U, 0x2B4BCB61U,
-        0x350C9B64U, 0x31CD86D3U, 0x3C8EA00AU, 0x384FBDBDU, 0x4C11DB70U, 0x48D0C6C7U,
-        0x4593E01EU, 0x4152FDA9U, 0x5F15ADACU, 0x5BD4B01BU, 0x569796C2U, 0x52568B75U,
-        0x6A1936C8U, 0x6ED82B7FU, 0x639B0DA6U, 0x675A1011U, 0x791D4014U, 0x7DDC5DA3U,
-        0x709F7B7AU, 0x745E66CDU, 0x9823B6E0U, 0x9CE2AB57U, 0x91A18D8EU, 0x95609039U,
-        0x8B27C03CU, 0x8FE6DD8BU, 0x82A5FB52U, 0x8664E6E5U, 0xBE2B5B58U, 0xBAEA46EFU,
-        0xB7A96036U, 0xB3687D81U, 0xAD2F2D84U, 0xA9EE3033U, 0xA4AD16EAU, 0xA06C0B5DU,
-        0xD4326D90U, 0xD0F37027U, 0xDDB056FEU, 0xD9714B49U, 0xC7361B4CU, 0xC3F706FBU,
-        0xCEB42022U, 0xCA753D95U, 0xF23A8028U, 0xF6FB9D9FU, 0xFBB8BB46U, 0xFF79A6F1U,
-        0xE13EF6F4U, 0xE5FFEB43U, 0xE8BCCD9AU, 0xEC7DD02DU, 0x34867077U, 0x30476DC0U,
-        0x3D044B19U, 0x39C556AEU, 0x278206ABU, 0x23431B1CU, 0x2E003DC5U, 0x2AC12072U,
-        0x128E9DCFU, 0x164F8078U, 0x1B0CA6A1U, 0x1FCDBB16U, 0x018AEB13U, 0x054BF6A4U,
-        0x0808D07DU, 0x0CC9CDCAU, 0x7897AB07U, 0x7C56B6B0U, 0x71159069U, 0x75D48DDEU,
-        0x6B93DDDBU, 0x6F52C06CU, 0x6211E6B5U, 0x66D0FB02U, 0x5E9F46BFU, 0x5A5E5B08U,
-        0x571D7DD1U, 0x53DC6066U, 0x4D9B3063U, 0x495A2DD4U, 0x44190B0DU, 0x40D816BAU,
-        0xACA5C697U, 0xA864DB20U, 0xA527FDF9U, 0xA1E6E04EU, 0xBFA1B04BU, 0xBB60ADFCU,
-        0xB6238B25U, 0xB2E29692U, 0x8AAD2B2FU, 0x8E6C3698U, 0x832F1041U, 0x87EE0DF6U,
-        0x99A95DF3U, 0x9D684044U, 0x902B669DU, 0x94EA7B2AU, 0xE0B41DE7U, 0xE4750050U,
-        0xE9362689U, 0xEDF73B3EU, 0xF3B06B3BU, 0xF771768CU, 0xFA325055U, 0xFEF34DE2U,
-        0xC6BCF05FU, 0xC27DEDE8U, 0xCF3ECB31U, 0xCBFFD686U, 0xD5B88683U, 0xD1799B34U,
-        0xDC3ABDEDU, 0xD8FBA05AU, 0x690CE0EEU, 0x6DCDFD59U, 0x608EDB80U, 0x644FC637U,
-        0x7A089632U, 0x7EC98B85U, 0x738AAD5CU, 0x774BB0EBU, 0x4F040D56U, 0x4BC510E1U,
-        0x46863638U, 0x42472B8FU, 0x5C007B8AU, 0x58C1663DU, 0x558240E4U, 0x51435D53U,
-        0x251D3B9EU, 0x21DC2629U, 0x2C9F00F0U, 0x285E1D47U, 0x36194D42U, 0x32D850F5U,
-        0x3F9B762CU, 0x3B5A6B9BU, 0x0315D626U, 0x07D4CB91U, 0x0A97ED48U, 0x0E56F0FFU,
-        0x1011A0FAU, 0x14D0BD4DU, 0x19939B94U, 0x1D528623U, 0xF12F560EU, 0xF5EE4BB9U,
-        0xF8AD6D60U, 0xFC6C70D7U, 0xE22B20D2U, 0xE6EA3D65U, 0xEBA91BBCU, 0xEF68060BU,
-        0xD727BBB6U, 0xD3E6A601U, 0xDEA580D8U, 0xDA649D6FU, 0xC423CD6AU, 0xC0E2D0DDU,
-        0xCDA1F604U, 0xC960EBB3U, 0xBD3E8D7EU, 0xB9FF90C9U, 0xB4BCB610U, 0xB07DABA7U,
-        0xAE3AFBA2U, 0xAAFBE615U, 0xA7B8C0CCU, 0xA379DD7BU, 0x9B3660C6U, 0x9FF77D71U,
-        0x92B45BA8U, 0x9675461FU, 0x8832161AU, 0x8CF30BADU, 0x81B02D74U, 0x857130C3U,
-        0x5D8A9099U, 0x594B8D2EU, 0x5408ABF7U, 0x50C9B640U, 0x4E8EE645U, 0x4A4FFBF2U,
-        0x470CDD2BU, 0x43CDC09CU, 0x7B827D21U, 0x7F436096U, 0x7200464FU, 0x76C15BF8U,
-        0x68860BFDU, 0x6C47164AU, 0x61043093U, 0x65C52D24U, 0x119B4BE9U, 0x155A565EU,
-        0x18197087U, 0x1CD86D30U, 0x029F3D35U, 0x065E2082U, 0x0B1D065BU, 0x0FDC1BECU,
-        0x3793A651U, 0x3352BBE6U, 0x3E119D3FU, 0x3AD08088U, 0x2497D08DU, 0x2056CD3AU,
-        0x2D15EBE3U, 0x29D4F654U, 0xC5A92679U, 0xC1683BCEU, 0xCC2B1D17U, 0xC8EA00A0U,
-        0xD6AD50A5U, 0xD26C4D12U, 0xDF2F6BCBU, 0xDBEE767CU, 0xE3A1CBC1U, 0xE760D676U,
-        0xEA23F0AFU, 0xEEE2ED18U, 0xF0A5BD1DU, 0xF464A0AAU, 0xF9278673U, 0xFDE69BC4U,
-        0x89B8FD09U, 0x8D79E0BEU, 0x803AC667U, 0x84FBDBD0U, 0x9ABC8BD5U, 0x9E7D9662U,
-        0x933EB0BBU, 0x97FFAD0CU, 0xAFB010B1U, 0xAB710D06U, 0xA6322BDFU, 0xA2F33668U,
-        0xBCB4666DU, 0xB8757BDAU, 0xB5365D03U, 0xB1F740B4U,
-    };
-
-    while (len > 0) {
-        crc = table[*data ^ ((crc >> 24) & 0xff)] ^ (crc << 8);
-        data++;
-        len--;
-    }
-    return crc;
-}
-
-unsigned int update_crc32(unsigned int crc, const std::string s)
-{
-    return update_crc32(crc, (const unsigned char*)s.data(), s.size());
-}
-
-unsigned int crc32(const unsigned char* buf, size_t len)
-{
-    return update_crc32(0xffffffff, buf, len) ^ 0xffffffff;
-}
-
-unsigned int crc32(const std::string s)
-{
-    return crc32((const unsigned char*)s.data(), s.size());
-}
-
-} /* namespace digital */
-} /* namespace gr */
diff --git a/gr-digital/python/digital/bindings/CMakeLists.txt b/gr-digital/python/digital/bindings/CMakeLists.txt
index a18fc0f0bc..4d24678ec9 100644
--- a/gr-digital/python/digital/bindings/CMakeLists.txt
+++ b/gr-digital/python/digital/bindings/CMakeLists.txt
@@ -28,7 +28,6 @@ list(APPEND digital_python_files
     correlate_access_code_tag_ff_python.cc
     costas_loop_cc_python.cc
     cpmmod_bc_python.cc
-    crc32_python.cc
     crc32_async_bb_python.cc
     crc32_bb_python.cc
     decision_feedback_equalizer_python.cc
diff --git a/gr-digital/python/digital/bindings/crc32_python.cc b/gr-digital/python/digital/bindings/crc32_python.cc
deleted file mode 100644
index cea28e8ee7..0000000000
--- a/gr-digital/python/digital/bindings/crc32_python.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-
-/***********************************************************************************/
-/* This file is automatically generated using bindtool and can be manually edited  */
-/* The following lines can be configured to regenerate this file during cmake      */
-/* If manual edits are made, the following tags should be modified accordingly.    */
-/* BINDTOOL_GEN_AUTOMATIC(0)                                                       */
-/* BINDTOOL_USE_PYGCCXML(0)                                                        */
-/* BINDTOOL_HEADER_FILE(crc32.h)                                        */
-/* BINDTOOL_HEADER_FILE_HASH(68481b3e03e592f988af1aa2821ee982)                     */
-/***********************************************************************************/
-
-#include <pybind11/complex.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
-namespace py = pybind11;
-
-#include <gnuradio/digital/crc32.h>
-// pydoc.h is automatically generated in the build directory
-#include <crc32_pydoc.h>
-
-void bind_crc32(py::module& m)
-{
-
-
-    m.def("update_crc32",
-          (unsigned int (*)(unsigned int, unsigned char const*, size_t)) &
-              ::gr::digital::update_crc32,
-          py::arg("crc"),
-          py::arg("buf"),
-          py::arg("len"),
-          D(update_crc32, 0));
-
-
-    m.def("update_crc32",
-          (unsigned int (*)(unsigned int, std::string const)) &
-              ::gr::digital::update_crc32,
-          py::arg("crc"),
-          py::arg("buf"),
-          D(update_crc32, 1));
-
-
-    m.def("crc32",
-          (unsigned int (*)(unsigned char const*, size_t)) & ::gr::digital::crc32,
-          py::arg("buf"),
-          py::arg("len"),
-          D(crc32, 0));
-
-
-    m.def("crc32",
-          (unsigned int (*)(std::string const)) & ::gr::digital::crc32,
-          py::arg("buf"),
-          D(crc32, 1));
-}
diff --git a/gr-digital/python/digital/bindings/docstrings/crc32_pydoc_template.h b/gr-digital/python/digital/bindings/docstrings/crc32_pydoc_template.h
deleted file mode 100644
index 75ae8d3814..0000000000
--- a/gr-digital/python/digital/bindings/docstrings/crc32_pydoc_template.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2020 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- */
-#include "pydoc_macros.h"
-#define D(...) DOC(gr, digital, __VA_ARGS__)
-/*
-  This file contains placeholders for docstrings for the Python bindings.
-  Do not edit! These were automatically extracted during the binding process
-  and will be overwritten during the build process
- */
-
-
-static const char* __doc_gr_digital_update_crc32_0 = R"doc()doc";
-
-
-static const char* __doc_gr_digital_update_crc32_1 = R"doc()doc";
-
-
-static const char* __doc_gr_digital_crc32_0 = R"doc()doc";
-
-
-static const char* __doc_gr_digital_crc32_1 = R"doc()doc";
diff --git a/gr-digital/python/digital/bindings/python_bindings.cc b/gr-digital/python/digital/bindings/python_bindings.cc
index 2621412e6a..830902679d 100644
--- a/gr-digital/python/digital/bindings/python_bindings.cc
+++ b/gr-digital/python/digital/bindings/python_bindings.cc
@@ -38,7 +38,6 @@ void bind_correlate_access_code_tag_bb(py::module&);
 void bind_correlate_access_code_tag_ff(py::module&);
 void bind_costas_loop_cc(py::module&);
 void bind_cpmmod_bc(py::module&);
-void bind_crc32(py::module&);
 void bind_crc32_async_bb(py::module&);
 void bind_crc32_bb(py::module&);
 void bind_decision_feedback_equalizer(py::module&);
@@ -140,7 +139,6 @@ PYBIND11_MODULE(digital_python, m)
     bind_correlate_access_code_tag_ff(m);
     bind_costas_loop_cc(m);
     bind_cpmmod_bc(m);
-    bind_crc32(m);
     bind_crc32_async_bb(m);
     bind_crc32_bb(m);
     bind_decision_feedback_equalizer(m);
diff --git a/gr-digital/python/digital/crc.py b/gr-digital/python/digital/crc.py
index 0b48da69a6..2cec0d446e 100644
--- a/gr-digital/python/digital/crc.py
+++ b/gr-digital/python/digital/crc.py
@@ -5,21 +5,28 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
-#
+"""
+Backward-compatible wrapper for CRC32
+"""
 
-from . import digital_python as digital
+import zlib
 import struct
 
-def gen_and_append_crc32(s):
-    crc = digital.crc32(s)
-    return s + struct.pack(">I", crc)
+def gen_and_append_crc32(data):
+    """
+    Return a binary string with its CRC appended
+    """
+    return data + struct.pack(">I", zlib.crc32(data))
+
+def check_crc32(data):
+    """
+    Check if the byte string 's' has a valid CRC on its last four bytes
 
-def check_crc32(s):
-    if len(s) < 4:
+    Returns a tuple (is CRC valid, string-without-CRC).
+    """
+    if len(data) < 4:
         return (False, '')
-    msg = s[:-4]
-    #print "msg = '%s'" % (msg,)
-    actual = digital.crc32(msg)
-    (expected,) = struct.unpack(">I", s[-4:])
-    # print "actual =", hex(actual), "expected =", hex(expected)
+    msg = data[:-4] # Message without the CRC
+    actual = zlib.crc32(msg)
+    (expected,) = struct.unpack(">I", data[-4:])
     return (actual == expected, msg)
diff --git a/gr-digital/python/digital/qa_crc32.py b/gr-digital/python/digital/qa_crc32.py
deleted file mode 100644
index 8207a34e73..0000000000
--- a/gr-digital/python/digital/qa_crc32.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2011 Free Software Foundation, Inc.
-#
-# This file is part of GNU Radio
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-#
-
-
-import cmath
-
-from gnuradio import gr, gr_unittest, digital
-
-
-class test_crc32(gr_unittest.TestCase):
-
-    def setUp(self):
-        self.tb = gr.top_block()
-
-    def tearDown(self):
-        self.tb = None
-
-    def test01(self):
-        data = 100 * "0"
-        expected_result = 2943744955
-        result = digital.crc32(data)
-        # print hex(result)
-
-        self.assertEqual(expected_result, result)
-
-    def test02(self):
-        data = 100 * "1"
-        expected_result = 2326594156
-        result = digital.crc32(data)
-        # print hex(result)
-
-        self.assertEqual(expected_result, result)
-
-    def test03(self):
-        data = 10 * "0123456789"
-        expected_result = 3774345973
-        result = digital.crc32(data)
-        # print hex(result)
-
-        self.assertEqual(expected_result, result)
-
-
-if __name__ == '__main__':
-    gr_unittest.run(test_crc32)