Clean up some string and hashing utility functions

Author: hhvrc

include/Hashing.h

@@ -8,6 +8,7 @@
 
 #include <array>  // TODO: When we use C++20, change this to <span>
 #include <cstdint>
+#include <string_view>
 
 namespace OpenShock {
   class MD5 {
@@ -20,6 +21,7 @@ namespace OpenShock {
 
     inline bool begin() { return mbedtls_md5_starts_ret(&ctx) == 0; }
     inline bool update(const uint8_t* data, std::size_t dataLen) { return mbedtls_md5_update_ret(&ctx, data, dataLen) == 0; }
+    inline bool update(std::string_view data) { return update(reinterpret_cast<const uint8_t*>(data.data()), data.length()); }
     inline bool finish(std::array<uint8_t, 16>& hash) { return mbedtls_md5_finish_ret(&ctx, hash.data()) == 0; }
 
   private:
@@ -35,6 +37,7 @@ namespace OpenShock {
 
     inline bool begin() { return mbedtls_sha1_starts_ret(&ctx) == 0; }
     inline bool update(const uint8_t* data, std::size_t dataLen) { return mbedtls_sha1_update_ret(&ctx, data, dataLen) == 0; }
+    inline bool update(std::string_view data) { return update(reinterpret_cast<const uint8_t*>(data.data()), data.length()); }
     inline bool finish(std::array<uint8_t, 20>& hash) { return mbedtls_sha1_finish_ret(&ctx, hash.data()) == 0; }
 
   private:
@@ -50,6 +53,7 @@ namespace OpenShock {
 
     inline bool begin() { return mbedtls_sha256_starts_ret(&ctx, 0) == 0; }
     inline bool update(const uint8_t* data, std::size_t dataLen) { return mbedtls_sha256_update_ret(&ctx, data, dataLen) == 0; }
+    inline bool update(std::string_view data) { return update(reinterpret_cast<const uint8_t*>(data.data()), data.length()); }
     inline bool finish(std::array<uint8_t, 32>& hash) { return mbedtls_sha256_finish_ret(&ctx, hash.data()) == 0; }
 
   private:

include/util/StringUtils.h

@@ -62,5 +62,8 @@ namespace OpenShock {
   std::vector<std::string_view> StringSplit(const std::string_view view, bool (*predicate)(char delimiter), std::size_t maxSplits = std::numeric_limits<std::size_t>::max());
   std::vector<std::string_view> StringSplitNewLines(const std::string_view view, std::size_t maxSplits = std::numeric_limits<std::size_t>::max());
   std::vector<std::string_view> StringSplitWhiteSpace(const std::string_view view, std::size_t maxSplits = std::numeric_limits<std::size_t>::max());
+
+  bool StringIEquals(const std::string_view a, const std::string_view b);
+
   String StringToArduinoString(std::string_view view);
 }  // namespace OpenShock

src/Convert.cpp

@@ -1,6 +1,7 @@
 #include "Convert.h"
 
 #include "util/DigitCounter.h"
+#include "util/StringUtils.h"
 
 #include <cstdint>
 #include <cstring>
@@ -234,12 +235,12 @@ bool Convert::ToBool(std::string_view str, bool& val)
     return false;
   }
 
-  if (strncasecmp(str.data(), "true", str.length()) == 0) {
+  if (OpenShock::StringIEquals(str, "true"sv)) {
     val = true;
     return true;
   }
 
-  if (strncasecmp(str.data(), "false", str.length()) == 0) {
+  if (OpenShock::StringIEquals(str, "false"sv)) {
     val = false;
     return true;
   }

src/serial/SerialInputHandler.cpp

@@ -51,7 +51,7 @@ namespace std {
   };
 
   struct equals_ci {
-    bool operator()(std::string_view a, std::string_view b) const { return strncasecmp(a.data(), b.data(), std::max(a.size(), b.size())) == 0; }
+    bool operator()(std::string_view a, std::string_view b) const { return OpenShock::StringIEquals(a, b); }
   };
 }  // namespace std
 

src/util/StringUtils.cpp

@@ -123,6 +123,12 @@ std::vector<std::string_view> OpenShock::StringSplitWhiteSpace(const std::string
   );
 }
 
+bool OpenShock::StringIEquals(const std::string_view a, const std::string_view b)
+{
+  if (a.size() != b.size()) return false;
+  return strncasecmp(a.data(), b.data(), a.size()) == 0;
+}
+
 String OpenShock::StringToArduinoString(std::string_view view) {
   return String(view.data(), view.size());
 }