X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=48bfc00410a6d62204c28376f579d3b093969c8b;hb=43b5073d6f80a8dcb7044ecd127fd5893da033ab;hp=07c9ea04b674a3a2d00ea6a3666b2183b56965fd;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 07c9ea04b..48bfc0041 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,22 +56,15 @@
  * 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
  */
-class SHA256Context : public classbase
+class SHA256Context
 {
  public:
 	unsigned int tot_len;
@@ -132,9 +134,7 @@ uint32_t sha256_k[64] =
 	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
 };
 
-const char* const hxc("0123456789abcdef");
-
-class ModuleSHA256 : public Module
+class HashSHA256 : public HashProvider
 {
 	void SHA256Init(SHA256Context *ctx, const unsigned int* ikey)
 	{
@@ -238,54 +238,36 @@ class ModuleSHA256 : public Module
 			UNPACK32(ctx->h[i], &digest[i << 2]);
 	}
 
-	void SHA256(const char *src, char *dest, unsigned int len)
+	void SHA256(const char *src, unsigned char *dest, unsigned int len)
 	{
-		// Generate the hash
-		unsigned char bytehash[SHA256_DIGEST_SIZE];
 		SHA256Context ctx;
 		SHA256Init(&ctx, NULL);
 		SHA256Update(&ctx, (unsigned char *)src, len);
-		SHA256Final(&ctx, bytehash);
-		// Convert it to hex
-		int j=0;
-		for (int i = 0; i < SHA256_DIGEST_SIZE; i++)
-		{
-			dest[j++] = hxc[bytehash[i] / 16];
-			dest[j++] = hxc[bytehash[i] % 16];
-		}
-		dest[j] = '\0';
+		SHA256Final(&ctx, dest);
 	}
 
  public:
-	ModuleSHA256()
-	{
-		ServerInstance->Modules->PublishInterface("HashRequest", this);
-	}
-
-	virtual ~ModuleSHA256()
+	std::string GenerateRaw(const std::string& data)
 	{
-		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, "sha256", 32, 64) {}
+};
 
-	void OnRequest(Request& request)
+class ModuleSHA256 : public Module
+{
+	HashSHA256 sha;
+ public:
+	ModuleSHA256() : sha(this)
 	{
-		if (strcmp("HASH", request.id) == 0)
-		{
-			char res[65];
-			HashRequest& req = static_cast<HashRequest&>(request);
-			SHA256(req.data.data(), res, req.data.length());
-			req.result = res;
-		}
-		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|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Implements SHA-256 hashing", VF_VENDOR);
 	}
 };