X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=1f967207b27fb49e2ef26d8fe2e11c02d28c279c;hb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;hp=6ba625a412673444f729c7ab90fff99e0a912610;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index 6ba625a41..1f967207b 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -50,15 +50,10 @@ /* $ModDesc: Allows for SHA-256 encrypted oper passwords */ /* $ModDep: m_hash.h */ -#include "inspircd_config.h" +#include "inspircd.h" #ifdef HAS_STDINT #include #endif -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "inspircd.h" - #include "m_hash.h" #ifndef HAS_STDINT @@ -139,12 +134,12 @@ uint32_t sha256_k[64] = class ModuleSHA256 : public Module { - 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 { @@ -155,7 +150,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]; @@ -164,7 +159,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++) @@ -188,10 +183,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) { @@ -208,8 +222,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; @@ -221,99 +235,46 @@ 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) + + void SHA256(const char *src, unsigned char *dest, unsigned int len) { - // 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'; - } + SHA256Context ctx; + SHA256Init(&ctx, NULL); + SHA256Update(&ctx, (unsigned char *)src, len); + SHA256Final(&ctx, dest); } - unsigned int* key; - char* chars; - public: - - ModuleSHA256(InspIRCd* Me) : Module::Module(Me), key(NULL), chars(NULL) + ModuleSHA256() { - ServerInstance->PublishInterface("HashRequest", this); + ServerInstance->Modules->PublishInterface("HashRequest", this); } virtual ~ModuleSHA256() { - ServerInstance->UnpublishInterface("HashRequest", this); + ServerInstance->Modules->UnpublishInterface("HashRequest", this); } - void Implements(char *List) - { - List[I_OnRequest] = 1; - } - virtual char* OnRequest(Request* request) + void OnRequest(Request& request) { - 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("NAME", request->GetId()) == 0) + if (strcmp("HASH", request.id) == 0) { - return "sha256"; + unsigned char bytes[SHA256_DIGEST_SIZE]; + HashRequest& req = static_cast(request); + SHA256(req.data.data(), bytes, req.data.length()); + req.binresult.assign((char*)bytes, SHA256_DIGEST_SIZE); } - else if (strcmp("RESET", request->GetId()) == 0) + else if (strcmp("NAME", request.id) == 0) { - this->chars = NULL; - this->key = NULL; + static_cast(request).response = "sha256"; } - return NULL; - } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 1, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); - } -}; - - -class ModuleSHA256Factory : public ModuleFactory -{ -public: - ModuleSHA256Factory() - { } - ~ModuleSHA256Factory() + Version GetVersion() { + return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER); } - - virtual Module *CreateModule(InspIRCd* Me) - { - return new ModuleSHA256(Me); - } - }; -extern "C" void * init_module( void ) -{ - return new ModuleSHA256Factory; -} +MODULE_INIT(ModuleSHA256)