MD5Digest: Span-ify

src/common/md5_digest.cpp

@@ -137,6 +137,16 @@ void MD5Digest::Reset()
   this->bits[1] = 0;
 }
 
+std::array<u8, MD5Digest::DIGEST_SIZE> MD5Digest::HashData(std::span<const u8> data)
+{
+  std::array<u8, DIGEST_SIZE> ret;
+
+  MD5Digest digest;
+  digest.Update(data);
+  digest.Final(ret);
+  return ret;
+}
+
 void MD5Digest::Update(const void* pData, u32 cbData)
 {
   u32 t;
@@ -185,7 +195,13 @@ void MD5Digest::Update(const void* pData, u32 cbData)
   std::memcpy(this->in, pByteData, cbData);
 }
 
-void MD5Digest::Final(u8 Digest[16])
+void MD5Digest::Update(std::span<const u8> data)
+{
+  if (!data.empty())
+    Update(data.data(), static_cast<u32>(data.size_bytes()));
+}
+
+void MD5Digest::Final(std::span<u8, DIGEST_SIZE> digest)
 {
   u32 count;
   u8* p;
@@ -225,5 +241,5 @@ void MD5Digest::Final(u8 Digest[16])
 
   MD5Transform(this->buf, (u32*)this->in);
   byteReverse((unsigned char*)this->buf, 4);
-  std::memcpy(Digest, this->buf, 16);
+  std::memcpy(digest.data(), this->buf, 16);
 }

src/common/md5_digest.h

@@ -1,18 +1,26 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
 #include "types.h"
 
+#include <array>
+#include <span>
+
 class MD5Digest
 {
 public:
+  static constexpr u32 DIGEST_SIZE = 16;
+
   MD5Digest();
 
   void Update(const void* pData, u32 cbData);
-  void Final(u8 Digest[16]);
+  void Update(std::span<const u8> data);
+  void Final(std::span<u8, DIGEST_SIZE> digest);
   void Reset();
 
+  static std::array<u8, DIGEST_SIZE> HashData(std::span<const u8> data);
+
 private:
   u32 buf[4];
   u32 bits[2];