LibCrypto: Use AK::Variant in HashManager

Userland/Libraries/LibCrypto/Hash/HashManager.h

@@ -29,6 +29,11 @@ enum class HashKind {
 struct MultiHashDigestVariant {
     constexpr static size_t Size = 0;
 
+    MultiHashDigestVariant(Empty digest)
+        : m_digest(move(digest))
+    {
+    }
+
     MultiHashDigestVariant(MD5::DigestType digest)
         : m_digest(move(digest))
     {
@@ -99,74 +104,53 @@ public:
 
     ~Manager()
     {
-        m_sha1 = nullptr;
+        m_algorithm = Empty {};
-        m_sha256 = nullptr;
-        m_sha384 = nullptr;
-        m_sha512 = nullptr;
-        m_md5 = nullptr;
     }
 
     inline size_t digest_size() const
     {
-        switch (m_kind) {
+        size_t result = 0;
-        case HashKind::MD5:
+        m_algorithm.visit(
-            return m_md5->digest_size();
+            [&](const Empty&) {},
-        case HashKind::SHA1:
+            [&](const auto& hash) { result = hash.digest_size(); });
-            return m_sha1->digest_size();
+        return result;
-        case HashKind::SHA256:
-            return m_sha256->digest_size();
-        case HashKind::SHA384:
-            return m_sha384->digest_size();
-        case HashKind::SHA512:
-            return m_sha512->digest_size();
-        default:
-        case HashKind::None:
-            return 0;
-        }
     }
+
     inline size_t block_size() const
     {
-        switch (m_kind) {
+        size_t result = 0;
-        case HashKind::MD5:
+        m_algorithm.visit(
-            return m_md5->block_size();
+            [&](const Empty&) {},
-        case HashKind::SHA1:
+            [&](const auto& hash) { result = hash.block_size(); });
-            return m_sha1->block_size();
+        return result;
-        case HashKind::SHA256:
-            return m_sha256->block_size();
-        case HashKind::SHA384:
-            return m_sha384->block_size();
-        case HashKind::SHA512:
-            return m_sha512->block_size();
-        default:
-        case HashKind::None:
-            return 0;
-        }
     }
+
     inline void initialize(HashKind kind)
     {
-        if (m_kind != HashKind::None) {
+        if (!m_algorithm.has<Empty>()) {
             VERIFY_NOT_REACHED();
         }
 
         m_kind = kind;
         switch (kind) {
         case HashKind::MD5:
-            m_md5 = make<MD5>();
+            m_algorithm = MD5();
             break;
         case HashKind::SHA1:
-            m_sha1 = make<SHA1>();
+            m_algorithm = SHA1();
             break;
         case HashKind::SHA256:
-            m_sha256 = make<SHA256>();
+            m_algorithm = SHA256();
             break;
         case HashKind::SHA384:
-            m_sha384 = make<SHA384>();
+            m_algorithm = SHA384();
             break;
         case HashKind::SHA512:
-            m_sha512 = make<SHA512>();
+            m_algorithm = SHA512();
             break;
         default:
         case HashKind::None:
+            m_algorithm = Empty {};
             break;
         }
     }
@@ -174,59 +158,25 @@ public:
     virtual void update(const u8* data, size_t length) override
     {
         auto size = m_pre_init_buffer.size();
-        switch (m_kind) {
+        if (size) {
-        case HashKind::MD5:
+            m_algorithm.visit(
-            if (size)
+                [&](Empty&) {},
-                m_md5->update(m_pre_init_buffer);
+                [&](auto& hash) { hash.update(m_pre_init_buffer); });
-            m_md5->update(data, length);
-            break;
-        case HashKind::SHA1:
-            if (size)
-                m_sha1->update(m_pre_init_buffer);
-            m_sha1->update(data, length);
-            break;
-        case HashKind::SHA256:
-            if (size)
-                m_sha256->update(m_pre_init_buffer);
-            m_sha256->update(data, length);
-            break;
-        case HashKind::SHA384:
-            if (size)
-                m_sha384->update(m_pre_init_buffer);
-            m_sha384->update(data, length);
-            break;
-        case HashKind::SHA512:
-            if (size)
-                m_sha512->update(m_pre_init_buffer);
-            m_sha512->update(data, length);
-            break;
-        default:
-        case HashKind::None:
-            m_pre_init_buffer.append(data, length);
-            return;
         }
-        if (size)
+        m_algorithm.visit(
+            [&](Empty&) { m_pre_init_buffer.append(data, length); },
+            [&](auto& hash) { hash.update(data, length); });
+        if (size && m_kind != HashKind::None)
             m_pre_init_buffer.clear();
     }
 
     virtual DigestType peek() override
     {
-        switch (m_kind) {
+        DigestType result = Empty {};
-        case HashKind::MD5:
+        m_algorithm.visit(
-            return { m_md5->peek() };
+            [&](Empty&) { VERIFY_NOT_REACHED(); },
-        case HashKind::SHA1:
+            [&](auto& hash) { result = hash.peek(); });
-            return { m_sha1->peek() };
+        return result;
-        case HashKind::SHA256:
-            return { m_sha256->peek() };
-        case HashKind::SHA384:
-            return { m_sha384->peek() };
-        case HashKind::SHA512:
-            return { m_sha512->peek() };
-        default:
-        case HashKind::None:
-            VERIFY_NOT_REACHED();
-            break;
-        }
     }
 
     virtual DigestType digest() override
@@ -239,45 +189,18 @@ public:
     virtual void reset() override
     {
         m_pre_init_buffer.clear();
-        switch (m_kind) {
+        m_algorithm.visit(
-        case HashKind::MD5:
+            [&](Empty&) {},
-            m_md5->reset();
+            [&](auto& hash) { hash.reset(); });
-            break;
-        case HashKind::SHA1:
-            m_sha1->reset();
-            break;
-        case HashKind::SHA256:
-            m_sha256->reset();
-            break;
-        case HashKind::SHA384:
-            m_sha384->reset();
-            break;
-        case HashKind::SHA512:
-            m_sha512->reset();
-            break;
-        default:
-        case HashKind::None:
-            break;
-        }
     }
 
     virtual String class_name() const override
     {
-        switch (m_kind) {
+        String result;
-        case HashKind::MD5:
+        m_algorithm.visit(
-            return m_md5->class_name();
+            [&](const Empty&) { result = "UninitializedHashManager"; },
-        case HashKind::SHA1:
+            [&](const auto& hash) { result = hash.class_name(); });
-            return m_sha1->class_name();
+        return result;
-        case HashKind::SHA256:
-            return m_sha256->class_name();
-        case HashKind::SHA384:
-            return m_sha384->class_name();
-        case HashKind::SHA512:
-            return m_sha512->class_name();
-        default:
-        case HashKind::None:
-            return "UninitializedHashManager";
-        }
     }
 
     inline bool is(HashKind kind) const
@@ -286,11 +209,8 @@ public:
     }
 
 private:
-    OwnPtr<SHA1> m_sha1;
+    using AlgorithmVariant = Variant<Empty, MD5, SHA1, SHA256, SHA384, SHA512>;
-    OwnPtr<SHA256> m_sha256;
+    AlgorithmVariant m_algorithm { Empty {} };
-    OwnPtr<SHA384> m_sha384;
-    OwnPtr<SHA512> m_sha512;
-    OwnPtr<MD5> m_md5;
     HashKind m_kind { HashKind::None };
     ByteBuffer m_pre_init_buffer;
 };

Userland/Libraries/LibCrypto/Hash/MD5.h

@@ -100,7 +100,7 @@ private:
     u32 m_count[2] { 0, 0 };
     Bytes m_buffer;
 
-    u8 m_data_buffer[64];
+    u8 m_data_buffer[64] {};
 };
 
 }

Userland/Libraries/LibCrypto/Hash/SHA1.h

@@ -73,7 +73,7 @@ public:
 private:
     inline void transform(const u8*);
 
-    u8 m_data_buffer[BlockSize];
+    u8 m_data_buffer[BlockSize] {};
     size_t m_data_length { 0 };
 
     u64 m_bit_length { 0 };

Userland/Libraries/LibCrypto/Hash/SHA2.h

@@ -121,7 +121,7 @@ public:
 private:
     inline void transform(const u8*);
 
-    u8 m_data_buffer[BlockSize];
+    u8 m_data_buffer[BlockSize] {};
     size_t m_data_length { 0 };
 
     u64 m_bit_length { 0 };
@@ -171,7 +171,7 @@ public:
 private:
     inline void transform(const u8*);
 
-    u8 m_data_buffer[BlockSize];
+    u8 m_data_buffer[BlockSize] {};
     size_t m_data_length { 0 };
 
     u64 m_bit_length { 0 };
@@ -221,7 +221,7 @@ public:
 private:
     inline void transform(const u8*);
 
-    u8 m_data_buffer[BlockSize];
+    u8 m_data_buffer[BlockSize] {};
     size_t m_data_length { 0 };
 
     u64 m_bit_length { 0 };