X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_md5.cpp;h=6ac9c3d87f78664a762f5a802b8aadb38c67cc9b;hb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;hp=a753ef5772b4b88346375187bf41d1750b078a61;hpb=e770f8d983bc4eb674956ca365a70598615948f5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp index a753ef577..6ac9c3d87 100644 --- a/src/modules/m_md5.cpp +++ b/src/modules/m_md5.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * 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. * @@ -17,17 +14,10 @@ /* $ModDesc: Allows for MD5 encrypted oper passwords */ /* $ModDep: m_hash.h */ -using namespace std; - -#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" /* The four core functions - F1 is optimized somewhat */ @@ -38,7 +28,7 @@ using namespace std; /* This is the central step in the MD5 algorithm. */ #define MD5STEP(f,w,x,y,z,in,s) \ - (w += f(x,y,z) + in, w = (w<>(32-s)) + x) + (w += f(x,y,z) + in, w = (w<>(32-s)) + x) #ifndef HAS_STDINT typedef unsigned int uint32_t; @@ -49,7 +39,7 @@ typedef unsigned char byte; /** An MD5 context, used by m_opermd5 */ -class MD5Context : public classbase +class MD5Context { public: word32 buf[4]; @@ -62,7 +52,7 @@ class ModuleMD5 : public Module void byteSwap(word32 *buf, unsigned words) { byte *p = (byte *)buf; - + do { *buf++ = (word32)((unsigned)p[3] << 8 | p[2]) << 16 | @@ -70,12 +60,11 @@ class ModuleMD5 : public Module p += 4; } while (--words); } - - /* XXX - maybe if we had an md5/encryption moduletype? *shrug* */ - void MD5Init(struct MD5Context *ctx, unsigned int* key = NULL) + + void MD5Init(MD5Context *ctx, unsigned int* ikey = NULL) { /* These are the defaults for md5 */ - if (!key) + if (!ikey) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -84,26 +73,26 @@ class ModuleMD5 : public Module } else { - ctx->buf[0] = key[0]; - ctx->buf[1] = key[1]; - ctx->buf[2] = key[2]; - ctx->buf[3] = key[3]; + ctx->buf[0] = ikey[0]; + ctx->buf[1] = ikey[1]; + ctx->buf[2] = ikey[2]; + ctx->buf[3] = ikey[3]; } - + ctx->bytes[0] = 0; ctx->bytes[1] = 0; } - void MD5Update(struct MD5Context *ctx, byte const *buf, int len) + void MD5Update(MD5Context *ctx, byte const *buf, int len) { word32 t; - + /* Update byte count */ - + t = ctx->bytes[0]; if ((ctx->bytes[0] = t + len) < t) ctx->bytes[1]++; /* Carry from low to high */ - + t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */ if ((unsigned)t > (unsigned)len) { @@ -116,7 +105,7 @@ class ModuleMD5 : public Module MD5Transform(ctx->buf, ctx->in); buf += (unsigned)t; len -= (unsigned)t; - + /* Process data in 64-byte chunks */ while (len >= 64) { @@ -126,22 +115,22 @@ class ModuleMD5 : public Module buf += 64; len -= 64; } - + /* Handle any remaining bytes of data. */ memcpy(ctx->in, buf, len); } - - void MD5Final(byte digest[16], struct MD5Context *ctx) + + void MD5Final(byte digest[16], MD5Context *ctx) { int count = (int)(ctx->bytes[0] & 0x3f); /* Bytes in ctx->in */ byte *p = (byte *)ctx->in + count; /* First unused byte */ - + /* Set the first char of padding to 0x80. There is always room. */ *p++ = 0x80; - + /* Bytes of padding needed to make 56 bytes (-8..55) */ count = 56 - 1 - count; - + if (count < 0) { /* Padding forces an extra block */ memset(p, 0, count+8); @@ -152,26 +141,26 @@ class ModuleMD5 : public Module } memset(p, 0, count+8); byteSwap(ctx->in, 14); - + /* Append length in bits and transform */ ctx->in[14] = ctx->bytes[0] << 3; ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29; MD5Transform(ctx->buf, ctx->in); - + byteSwap(ctx->buf, 4); memcpy(digest, ctx->buf, 16); memset(ctx, 0, sizeof(ctx)); } - + void MD5Transform(word32 buf[4], word32 const in[16]) { register word32 a, b, c, d; - + a = buf[0]; b = buf[1]; c = buf[2]; d = buf[3]; - + MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); @@ -188,7 +177,7 @@ class ModuleMD5 : public Module MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - + MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); @@ -205,7 +194,7 @@ class ModuleMD5 : public Module MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - + MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); @@ -222,7 +211,7 @@ class ModuleMD5 : public Module MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - + MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); @@ -239,28 +228,28 @@ class ModuleMD5 : public Module MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); - + buf[0] += a; buf[1] += b; buf[2] += c; buf[3] += d; } - - - void MyMD5(void *dest, void *orig, int len, unsigned int* key) + + + void MyMD5(void *dest, void *orig, int len, unsigned int* ikey) { MD5Context context; - MD5Init(&context, key); + MD5Init(&context, ikey); MD5Update(&context, (const unsigned char*)orig, len); MD5Final((unsigned char*)dest, &context); } - - - void GenHash(const char* src, char* dest, const char* xtab, unsigned int* key) + + + void GenHash(const char* src, char* dest, const char* xtab, unsigned int* ikey, size_t srclen) { unsigned char bytes[16]; - MyMD5((char*)bytes, (void*)src, strlen(src), key); + MyMD5((char*)bytes, (void*)src, srclen, ikey); for (int i = 0; i < 16; i++) { @@ -270,77 +259,45 @@ class ModuleMD5 : public Module *dest++ = 0; } - unsigned int *key; - char* chars; - public: - ModuleMD5(InspIRCd* Me) - : Module::Module(Me), key(NULL), chars(NULL) + ModuleMD5() { + ServerInstance->Modules->PublishInterface("HashRequest", this); } - + virtual ~ModuleMD5() { + ServerInstance->Modules->UnpublishInterface("HashRequest", this); } - void Implements(char* List) - { - List[I_OnRequest] = 1; - } - - virtual char* OnRequest(Request* request) + + void OnRequest(Request& request) { - HashRequest* MD5 = (HashRequest*)request; - if (strcmp("KEY", request->GetId()) == 0) + if (strcmp("HASH", request.id) == 0) { - this->key = (unsigned int*)MD5->GetKeyData(); + char res[16]; + HashRequest& req = static_cast(request); + MyMD5(res, (void*)req.data.data(), req.data.length(), NULL); + req.binresult.assign(res, 16); } - else if (strcmp("HEX", request->GetId()) == 0) + else if (strcmp("HASH-IV", request.id) == 0) { - this->chars = (char*)MD5->GetOutputs(); + char res[33]; + HashRequestIV& req = static_cast(request); + GenHash(req.data.data(), res, req.map, req.iv, req.data.length()); + req.result = res; } - else if (strcmp("SUM", request->GetId()) == 0) + else if (strcmp("NAME", request.id) == 0) { - static char data[MAXBUF]; - GenHash((const char*)MD5->GetHashData(), data, chars ? chars : "0123456789abcdef", key); - return data; + static_cast(request).response = "md5"; } - else if (strcmp("RESET", request->GetId()) == 0) - { - this->chars = NULL; - this->key = NULL; - } - return NULL; } - virtual Version GetVersion() + Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR); } }; - -class ModuleMD5Factory : public ModuleFactory -{ - public: - ModuleMD5Factory() - { - } - - ~ModuleMD5Factory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleMD5(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleMD5Factory; -} +MODULE_INIT(ModuleMD5)