X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=d2755baccf806754a71397dc0d5a57297a14a8df;hb=df4afba6c23c939af1013582c94138832017af4e;hp=7856b296bcc3adbcc972748a3488c543b8696687;hpb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 7856b296b..d2755bacc 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* m_sha256 - Based on m_opersha256 written by Special <john@yarbbles.com>
  * Modified and improved by Craig Edwards, December 2006.
  *
@@ -47,18 +56,11 @@
  * SUCH DAMAGE.
  */
 
-/* $ModDesc: Allows for SHA-256 encrypted oper passwords */
-/* $ModDep: m_hash.h */
-
 #include "inspircd.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
-#include "m_hash.h"
+#include "modules/hash.h"
 
-#ifndef HAS_STDINT
-typedef unsigned int uint32_t;
-#endif
+#define SHA256_DIGEST_SIZE (256 / 8)
+#define SHA256_BLOCK_SIZE  (512 / 8)
 
 /** An sha 256 context, used by m_opersha256
  */
@@ -132,7 +134,7 @@ uint32_t sha256_k[64] =
 	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
 };
 
-class ModuleSHA256 : public Module
+class HashSHA256 : public HashProvider
 {
 	void SHA256Init(SHA256Context *ctx, const unsigned int* ikey)
 	{
@@ -245,35 +247,27 @@ class ModuleSHA256 : public Module
 	}
 
  public:
-	ModuleSHA256()
+	std::string sum(const std::string& data)
 	{
-		ServerInstance->Modules->PublishInterface("HashRequest", this);
-	}
-
-	virtual ~ModuleSHA256()
-	{
-		ServerInstance->Modules->UnpublishInterface("HashRequest", this);
+		unsigned char bytes[SHA256_DIGEST_SIZE];
+		SHA256(data.data(), bytes, data.length());
+		return std::string((char*)bytes, SHA256_DIGEST_SIZE);
 	}
 
+	HashSHA256(Module* parent) : HashProvider(parent, "hash/sha256", 32, 64) {}
+};
 
-	void OnRequest(Request& request)
+class ModuleSHA256 : public Module
+{
+	HashSHA256 sha;
+ public:
+	ModuleSHA256() : sha(this)
 	{
-		if (strcmp("HASH", request.id) == 0)
-		{
-			unsigned char bytes[SHA256_DIGEST_SIZE];
-			HashRequest& req = static_cast<HashRequest&>(request);
-			SHA256(req.data.data(), bytes, req.data.length());
-			req.binresult.assign((char*)bytes, SHA256_DIGEST_SIZE);
-		}
-		else if (strcmp("NAME", request.id) == 0)
-		{
-			static_cast<HashNameRequest&>(request).response = "sha256";
-		}
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR);
+		return Version("Implements SHA-256 hashing", VF_VENDOR);
 	}
 };