remove crc, use one from espressif which is sometimes in rom

Blockstream · May 15, 2024 · de039d6 · de039d6
1 parent 56cf4e0
commit de039d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 103 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,5 +2,5 @@ idf_component_register(SRC_DIRS "src"
  PRIV_REQUIRES mbedtls cbor
  INCLUDE_DIRS "src")
 
-target_compile_features(${COMPONENT_LIB} PRIVATE cxx_std_17)
+target_compile_features(${COMPONENT_LIB} PRIVATE cxx_std_20)
 target_compile_options(${COMPONENT_LIB} PRIVATE -Ofast)
diff --git a/src/crc32.c b/src/crc32.c
diff --git a/src/crc32.h b/src/crc32.h
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -7,17 +7,12 @@
 
 #include "utils.hpp"
 
-extern "C" {
-
-#include "crc32.h"
-
-}
-
 #include <array>
 #include <vector>
 #include <algorithm>
 #include <cctype>
 #include <mbedtls/sha256.h>
+#include <esp_crc.h>
 
 
 using namespace std;
@@ -36,14 +31,14 @@ void sha256(const ByteVector &buf, std::array<uint8_t, SHA256_LEN> &digest) {
 }
 
 ByteVector crc32_bytes(const ByteVector &buf) {
- uint32_t checksum = ur_crc32n(buf.data(), buf.size());
+ uint32_t checksum = __builtin_bswap32(crc32_int(buf));
  auto *cbegin = (uint8_t*)&checksum;
  auto *cend = cbegin + sizeof(uint32_t);
  return {cbegin, cend};
 }
 
 uint32_t crc32_int(const ByteVector &buf) {
- return ur_crc32(buf.data(), buf.size());
+ return esp_crc32_le(0, buf.data(), buf.size());
 }
 
 ByteVector string_to_bytes(const string& s) {