From 18cc57792422a56bddc5797ceaa80dfe57e009b2 Mon Sep 17 00:00:00 2001
From: Per Larsson <p3rl@protonmail.com>
Date: Thu, 3 Feb 2022 16:05:34 +0100
Subject: Enable encryption on all platforms.

---
 zencore/crypto.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'zencore/crypto.cpp')

diff --git a/zencore/crypto.cpp b/zencore/crypto.cpp
index 7fc524bf1..91315aa9a 100644
--- a/zencore/crypto.cpp
+++ b/zencore/crypto.cpp
@@ -18,11 +18,12 @@
 
 namespace zen {
 
-class NullCipher final : public SymmetricCipher
+class NoOpSymmetricCipher final : public SymmetricCipher
 {
 public:
-	NullCipher()		  = default;
-	virtual ~NullCipher() = default;
+	NoOpSymmetricCipher() = default;
+
+	virtual ~NoOpSymmetricCipher() = default;
 
 	virtual bool Initialize(MemoryView, MemoryView) override final { return true; }
 
@@ -34,12 +35,11 @@ public:
 };
 
 std::unique_ptr<SymmetricCipher>
-MakeNullCipher()
+SymmetricCipher::CreateNoOp()
 {
-	return std::make_unique<NullCipher>();
+	return std::make_unique<NoOpSymmetricCipher>();
 }
 
-#if ZEN_PLATFORM_WINDOWS
 class Aes final : public SymmetricCipher
 {
 public:
@@ -184,13 +184,11 @@ private:
 };
 
 std::unique_ptr<SymmetricCipher>
-MakeAesCipher()
+SymmetricCipher::CreateAes()
 {
 	return std::make_unique<Aes>();
 }
 
-#endif	// ZEN_PLATFORM_WINDOWS
-
 #if ZEN_WITH_TESTS
 
 using namespace std::literals;
-- 
cgit v1.2.3