X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=48bfc00410a6d62204c28376f579d3b093969c8b;hb=806e57433a38193ae14942ee60f573fe47f4b643;hp=07bcab3aed161827a57061192d12ce91ba07ec9b;hpb=e770f8d983bc4eb674956ca365a70598615948f5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index 07bcab3ae..48bfc0041 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -1,19 +1,25 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Craig Edwards * - * --------------------------------------------------- + * 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 . */ + /* m_sha256 - Based on m_opersha256 written by Special * Modified and improved by Craig Edwards, December 2006. * @@ -50,27 +56,15 @@ * SUCH DAMAGE. */ -/* $ModDesc: Allows for SHA-256 encrypted oper passwords */ -/* $ModDep: m_hash.h */ - -#include "inspircd_config.h" -#ifdef HAS_STDINT -#include -#endif -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" +#include "modules/hash.h" -#include "m_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; @@ -140,14 +134,14 @@ uint32_t sha256_k[64] = 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 }; -class ModuleSHA256 : public Module +class HashSHA256 : public HashProvider { - void SHA256Init(struct SHA256Context *ctx, const unsigned int* key) + void SHA256Init(SHA256Context *ctx, const unsigned int* ikey) { - if (key) + if (ikey) { for (int i = 0; i < 8; i++) - ctx->h[i] = key[i]; + ctx->h[i] = ikey[i]; } else { @@ -158,7 +152,7 @@ class ModuleSHA256 : public Module ctx->tot_len = 0; } - void SHA256Transform(struct SHA256Context *ctx, unsigned char *message, unsigned int block_nb) + void SHA256Transform(SHA256Context *ctx, unsigned char *message, unsigned int block_nb) { uint32_t w[64]; uint32_t wv[8]; @@ -167,7 +161,7 @@ class ModuleSHA256 : public Module { int j; sub_block = message + ((i - 1) << 6); - + for (j = 0; j < 16; j++) PACK32(&sub_block[j << 2], &w[j]); for (j = 16; j < 64; j++) @@ -191,10 +185,29 @@ class ModuleSHA256 : public Module ctx->h[j] += wv[j]; } } - - void SHA256Update(struct SHA256Context *ctx, unsigned char *message, unsigned int len) + + void SHA256Update(SHA256Context *ctx, unsigned char *message, unsigned int len) { - unsigned int rem_len = SHA256_BLOCK_SIZE - ctx->len; + /* + * XXX here be dragons! + * After many hours of pouring over this, I think I've found the problem. + * When Special created our module from the reference one, he used: + * + * unsigned int rem_len = SHA256_BLOCK_SIZE - ctx->len; + * + * instead of the reference's version of: + * + * unsigned int tmp_len = SHA256_BLOCK_SIZE - ctx->len; + * unsigned int rem_len = len < tmp_len ? len : tmp_len; + * + * I've changed back to the reference version of this code, and it seems to work with no errors. + * So I'm inclined to believe this was the problem.. + * -- w00t (January 06, 2008) + */ + unsigned int tmp_len = SHA256_BLOCK_SIZE - ctx->len; + unsigned int rem_len = len < tmp_len ? len : tmp_len; + + memcpy(&ctx->block[ctx->len], message, rem_len); if (ctx->len + len < SHA256_BLOCK_SIZE) { @@ -211,8 +224,8 @@ class ModuleSHA256 : public Module ctx->len = rem_len; ctx->tot_len += (block_nb + 1) << 6; } - - void SHA256Final(struct SHA256Context *ctx, unsigned char *digest) + + void SHA256Final(SHA256Context *ctx, unsigned char *digest) { unsigned int block_nb = (1 + ((SHA256_BLOCK_SIZE - 9) < (ctx->len % SHA256_BLOCK_SIZE))); unsigned int len_b = (ctx->tot_len + ctx->len) << 3; @@ -224,93 +237,38 @@ class ModuleSHA256 : public Module for (int i = 0 ; i < 8; i++) UNPACK32(ctx->h[i], &digest[i << 2]); } - - void SHA256(const char *src, char *dest, int len, const char* hxc, const unsigned int* key = NULL) - { - // Generate the hash - unsigned char bytehash[SHA256_DIGEST_SIZE]; - struct SHA256Context ctx; - SHA256Init(&ctx, key); - 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'; - } - } - - unsigned int* key; - char* chars; - - public: - - ModuleSHA256(InspIRCd* Me) : Module::Module(Me), key(NULL), chars(NULL) - { - } - - virtual ~ModuleSHA256() - { - } - void Implements(char *List) + void SHA256(const char *src, unsigned char *dest, unsigned int len) { - List[I_OnRequest] = 1; + SHA256Context ctx; + SHA256Init(&ctx, NULL); + SHA256Update(&ctx, (unsigned char *)src, len); + SHA256Final(&ctx, dest); } - virtual char* OnRequest(Request* request) + public: + std::string GenerateRaw(const std::string& data) { - 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, strlen(SHA->GetHashData()), chars ? chars : "0123456789abcdef", key); - return data; - } - else if (strcmp("RESET", request->GetId()) == 0) - { - this->chars = NULL; - this->key = NULL; - } - return NULL; + unsigned char bytes[SHA256_DIGEST_SIZE]; + SHA256(data.data(), bytes, data.length()); + return std::string((char*)bytes, SHA256_DIGEST_SIZE); } - virtual Version GetVersion() - { - return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION); - } + HashSHA256(Module* parent) : HashProvider(parent, "sha256", 32, 64) {} }; - -class ModuleSHA256Factory : public ModuleFactory +class ModuleSHA256 : public Module { -public: - ModuleSHA256Factory() - { - } - - ~ModuleSHA256Factory() + HashSHA256 sha; + public: + ModuleSHA256() : sha(this) { } - virtual Module *CreateModule(InspIRCd* Me) + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSHA256(Me); + return Version("Implements SHA-256 hashing", VF_VENDOR); } - }; -extern "C" void * init_module( void ) -{ - return new ModuleSHA256Factory; -} +MODULE_INIT(ModuleSHA256)