X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_md5.cpp;h=0de69c99a1ca61d1164da86c29736c892cdd3d07;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=6ac9c3d87f78664a762f5a802b8aadb38c67cc9b;hpb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp index 6ac9c3d87..0de69c99a 100644 --- a/src/modules/m_md5.cpp +++ b/src/modules/m_md5.cpp @@ -1,24 +1,31 @@ -/* +------------------------------------+ - * | 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) 2014 Daniel Vassdal + * Copyright (C) 2013, 2015, 2017 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2012 Garrett Holmstrom + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards * - * 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 . */ -/* $ModDesc: Allows for MD5 encrypted oper passwords */ -/* $ModDep: m_hash.h */ #include "inspircd.h" -#ifdef HAS_STDINT -#include -#endif -#include "m_hash.h" +#include "modules/hash.h" /* The four core functions - F1 is optimized somewhat */ #define F1(x, y, z) (z ^ (x & (y ^ z))) @@ -30,10 +37,6 @@ #define MD5STEP(f,w,x,y,z,in,s) \ (w += f(x,y,z) + in, w = (w<>(32-s)) + x) -#ifndef HAS_STDINT -typedef unsigned int uint32_t; -#endif - typedef uint32_t word32; /* NOT unsigned long. We don't support 16 bit platforms, anyway. */ typedef unsigned char byte; @@ -47,7 +50,7 @@ class MD5Context word32 in[16]; }; -class ModuleMD5 : public Module +class MD5Provider : public HashProvider { void byteSwap(word32 *buf, unsigned words) { @@ -61,23 +64,13 @@ class ModuleMD5 : public Module } while (--words); } - void MD5Init(MD5Context *ctx, unsigned int* ikey = NULL) + void MD5Init(MD5Context *ctx) { /* These are the defaults for md5 */ - if (!ikey) - { - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - } - else - { - ctx->buf[0] = ikey[0]; - ctx->buf[1] = ikey[1]; - ctx->buf[2] = ikey[2]; - ctx->buf[3] = ikey[3]; - } + ctx->buf[0] = 0x67452301; + ctx->buf[1] = 0xefcdab89; + ctx->buf[2] = 0x98badcfe; + ctx->buf[3] = 0x10325476; ctx->bytes[0] = 0; ctx->bytes[1] = 0; @@ -149,12 +142,12 @@ class ModuleMD5 : public Module byteSwap(ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); + memset(ctx, 0, sizeof(*ctx)); } void MD5Transform(word32 buf[4], word32 const in[16]) { - register word32 a, b, c, d; + word32 a, b, c, d; a = buf[0]; b = buf[1]; @@ -236,67 +229,36 @@ class ModuleMD5 : public Module } - void MyMD5(void *dest, void *orig, int len, unsigned int* ikey) + void MyMD5(void *dest, void *orig, int len) { MD5Context context; - MD5Init(&context, ikey); + MD5Init(&context); MD5Update(&context, (const unsigned char*)orig, len); MD5Final((unsigned char*)dest, &context); } - - 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, srclen, ikey); - - for (int i = 0; i < 16; i++) - { - *dest++ = xtab[bytes[i] / 16]; - *dest++ = xtab[bytes[i] % 16]; - } - *dest++ = 0; - } - public: - - ModuleMD5() - { - ServerInstance->Modules->PublishInterface("HashRequest", this); - } - - virtual ~ModuleMD5() + std::string GenerateRaw(const std::string& data) CXX11_OVERRIDE { - ServerInstance->Modules->UnpublishInterface("HashRequest", this); + char res[16]; + MyMD5(res, (void*)data.data(), data.length()); + return std::string(res, 16); } + MD5Provider(Module* parent) : HashProvider(parent, "md5", 16, 64) {} +}; - void OnRequest(Request& request) +class ModuleMD5 : public Module +{ + MD5Provider md5; + public: + ModuleMD5() : md5(this) { - if (strcmp("HASH", request.id) == 0) - { - 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("HASH-IV", request.id) == 0) - { - 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("NAME", request.id) == 0) - { - static_cast(request).response = "md5"; - } } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR); + return Version("Allows other modules to generate MD5 hashes.",VF_VENDOR); } };