X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=c41bd06997c38f67fe11a498662c6ce6087691e0;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=febfd88209bd17886ee09739ff8cfeee4b2319cf;hpb=25c8c8ba0247236f660bbbbfc665ae735f88fc31;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index febfd8820..c41bd0699 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-2008 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. @@ -159,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++) @@ -183,7 +183,7 @@ class ModuleSHA256 : public Module ctx->h[j] += wv[j]; } } - + void SHA256Update(SHA256Context *ctx, unsigned char *message, unsigned int len) { /* @@ -205,7 +205,7 @@ class ModuleSHA256 : public Module 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) { @@ -222,7 +222,7 @@ class ModuleSHA256 : public Module ctx->len = rem_len; ctx->tot_len += (block_nb + 1) << 6; } - + void SHA256Final(SHA256Context *ctx, unsigned char *digest) { unsigned int block_nb = (1 + ((SHA256_BLOCK_SIZE - 9) < (ctx->len % SHA256_BLOCK_SIZE))); @@ -235,7 +235,7 @@ 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* ikey = NULL) { // Generate the hash @@ -258,7 +258,7 @@ class ModuleSHA256 : public Module public: - ModuleSHA256(InspIRCd* Me) : Module(Me), key(NULL), chars(NULL) + ModuleSHA256() : key(NULL), chars(NULL) { ServerInstance->Modules->PublishInterface("HashRequest", this); Implementation eventlist[] = { I_OnRequest }; @@ -271,7 +271,7 @@ class ModuleSHA256 : public Module } - virtual char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { HashRequest* SHA = (HashRequest*)request; if (strcmp("KEY", request->GetId()) == 0) @@ -285,7 +285,7 @@ class ModuleSHA256 : public Module else if (strcmp("SUM", request->GetId()) == 0) { static char data[MAXBUF]; - SHA256((const char*)SHA->GetHashData(), data, strlen(SHA->GetHashData()), chars ? chars : "0123456789abcdef", key); + SHA256((const char*)SHA->GetHashData().data(), data, SHA->GetHashData().length(), chars ? chars : "0123456789abcdef", key); return data; } else if (strcmp("NAME", request->GetId()) == 0) @@ -302,7 +302,7 @@ class ModuleSHA256 : public Module virtual Version GetVersion() { - return Version(1, 1, 0, 1, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); + return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); } };