Add HashBuilder abstract class

Author: lucasssvaz

Diff for: cores/esp32/HashBuilder.h

@@ -0,0 +1,60 @@
+// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef HashBuilder_h
+#define HashBuilder_h
+
+#include <WString.h>
+#include <Stream.h>
+
+#include "HEXBuilder.h"
+
+class HashBuilder : public HEXBuilder
+{
+public:
+    virtual ~HashBuilder() {}
+    virtual void begin() = 0;
+
+    virtual void add(uint8_t* data, size_t len) = 0;
+    virtual void add(const char* data)
+    {
+        add((uint8_t*)data, strlen(data));
+    }
+    virtual void add(char* data)
+    {
+        add((const char*)data);
+    }
+    virtual void add(String data)
+    {
+        add(data.c_str());
+    }
+
+    virtual void addHexString(const char* data) = 0;
+    virtual void addHexString(char* data)
+    {
+        addHexString((const char*)data);
+    }
+    virtual void addHexString(String data)
+    {
+        addHexString(data.c_str());
+    }
+
+    virtual bool addStream(Stream& stream, const size_t maxLen) = 0;
+    virtual void calculate() = 0;
+    virtual void getBytes(uint8_t* output) = 0;
+    virtual void getChars(char* output) = 0;
+    virtual String toString() = 0;
+};
+
+#endif

Diff for: cores/esp32/MD5Builder.cpp

@@ -16,6 +16,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
 #include <Arduino.h>
 #include <HEXBuilder.h>
 #include <MD5Builder.h>
@@ -26,14 +27,14 @@ void MD5Builder::begin(void)
     esp_rom_md5_init(&_ctx);
 }
 
-void MD5Builder::add(uint8_t * data, uint16_t len)
+void MD5Builder::add(uint8_t * data, size_t len)
 {
     esp_rom_md5_update(&_ctx, data, len);
 }
 
 void MD5Builder::addHexString(const char * data)
 {
-    uint16_t len = strlen(data);
+    size_t len = strlen(data);
     uint8_t * tmp = (uint8_t*)malloc(len/2);
     if(tmp == NULL) {
         return;

Diff for: cores/esp32/MD5Builder.h

@@ -1,7 +1,7 @@
-/* 
+/*
   Copyright (c) 2015 Hristo Gochkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
- 
+  This file is part of the esp32 core for Arduino environment.
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -15,53 +15,39 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+  Modified 10 Jan 2024 by Lucas Saavedra Vaz (Use abstract class HashBuilder)
 */
-#ifndef __ESP8266_MD5_BUILDER__
-#define __ESP8266_MD5_BUILDER__
+#ifndef MD5Builder_h
+#define MD5Builder_h
 
 #include <WString.h>
 #include <Stream.h>
 
 #include "esp_system.h"
 #include "esp_rom_md5.h"
 
-#include "HEXBuilder.h"
+#include "HashBuilder.h"
 
-class MD5Builder : HEXBuilder
+class MD5Builder : public HashBuilder
 {
 private:
     md5_context_t _ctx;
     uint8_t _buf[ESP_ROM_MD5_DIGEST_LEN];
 public:
-    void begin(void);
-    void add(uint8_t * data, uint16_t len);
-    void add(const char * data)
-    {
-        add((uint8_t*)data, strlen(data));
-    }
-    void add(char * data)
-    {
-        add((const char*)data);
-    }
-    void add(String data)
-    {
-        add(data.c_str());
-    }
-    void addHexString(const char * data);
-    void addHexString(char * data)
-    {
-        addHexString((const char*)data);
-    }
-    void addHexString(String data)
-    {
-        addHexString(data.c_str());
-    }
-    bool addStream(Stream & stream, const size_t maxLen);
-    void calculate(void);
-    void getBytes(uint8_t * output);
-    void getChars(char * output);
-    String toString(void);
-};
+    void begin(void) override;
 
+    using HashBuilder::add;
+    void add(uint8_t * data, size_t len) override;
+
+    using HashBuilder::addHexString;
+    void addHexString(const char * data) override;
+
+    bool addStream(Stream & stream, const size_t maxLen) override;
+    void calculate(void) override;
+    void getBytes(uint8_t * output) override;
+    void getChars(char * output) override;
+    String toString(void) override;
+};
 
 #endif