m_dccallow Validate tokens before use

[user/henk/code/inspircd.git] / src / modules / m_sha256.cpp

diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index b6dc215db95f6c36af2c772c9603931c06c7897f..86970968a80740c43ef31204426e2e141854123c 100644 (file)
--- 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.
  *
@@ -48,21 +57,23 @@
  */
 
 /* $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 "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,7 +143,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)
        {
@@ -236,73 +247,42 @@ class ModuleSHA256 : public Module
                        UNPACK32(ctx->h[i], &digest[i << 2]);
        }
 
-       void SHA256(const char *src, char *dest, int len, const char* hxc, const unsigned int* ikey = NULL)
+       void SHA256(const char *src, unsigned char *dest, unsigned int len)
        {
-               // Generate the hash
-               unsigned char bytehash[SHA256_DIGEST_SIZE];
                SHA256Context ctx;
-               SHA256Init(&ctx, ikey);
-               SHA256Update(&ctx, (unsigned char *)src, (unsigned int)len);
-               SHA256Final(&ctx, bytehash);
-               // Convert it to hex
-               for (int i = 0, j = 0; i < SHA256_DIGEST_SIZE; i++)
-               {
-                       dest[j++] = hxc[bytehash[i] / 16];
-                       dest[j++] = hxc[bytehash[i] % 16];
-                       dest[j] = '\0';
-               }
+               SHA256Init(&ctx, NULL);
+               SHA256Update(&ctx, (unsigned char *)src, len);
+               SHA256Final(&ctx, dest);
        }
 
-       unsigned int* key;
-       char* chars;
-
  public:
-
-       ModuleSHA256(InspIRCd* Me) : Module(Me), key(NULL), chars(NULL)
+       std::string sum(const std::string& data)
        {
-               ServerInstance->Modules->PublishInterface("HashRequest", this);
-               Implementation eventlist[] = { I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               unsigned char bytes[SHA256_DIGEST_SIZE];
+               SHA256(data.data(), bytes, data.length());
+               return std::string((char*)bytes, SHA256_DIGEST_SIZE);
        }
 
-       virtual ~ModuleSHA256()
+       std::string sumIV(unsigned int* IV, const char* HexMap, const std::string &sdata)
        {
-               ServerInstance->Modules->UnpublishInterface("HashRequest", this);
+               return "";
        }
 
+       HashSHA256(Module* parent) : HashProvider(parent, "hash/sha256", 32, 64) {}
+};
 
-       virtual const char* OnRequest(Request* request)
+class ModuleSHA256 : public Module
+{
+       HashSHA256 sha;
+ public:
+       ModuleSHA256() : sha(this)
        {
-               HashRequest* SHA = (HashRequest*)request;
-               if (strcmp("KEY", request->GetId()) == 0)
-               {
-                       this->key = (unsigned int*)SHA->GetKeyData();
-               }
-               else if (strcmp("HEX", request->GetId()) == 0)
-               {
-                       this->chars = (char*)SHA->GetOutputs();
-               }
-               else if (strcmp("SUM", request->GetId()) == 0)
-               {
-                       static char data[MAXBUF];
-                       SHA256((const char*)SHA->GetHashData().data(), data, SHA->GetHashData().length(), chars ? chars : "0123456789abcdef", key);
-                       return data;
-               }
-               else if (strcmp("NAME", request->GetId()) == 0)
-               {
-                       return "sha256";
-               }
-               else if (strcmp("RESET", request->GetId()) == 0)
-               {
-                       this->chars = NULL;
-                       this->key = NULL;
-               }
-               return NULL;
+               ServerInstance->Modules->AddService(sha);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+               return Version("Implements SHA-256 hashing", VF_VENDOR);
        }
 };