X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sha256.cpp;h=547e7655cd24359a57b8e8879f48750c7fa24622;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;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..547e7655c 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -50,15 +50,13 @@
 /* $ModDesc: Allows for SHA-256 encrypted oper passwords */
 /* $ModDep: m_hash.h */
 
-#include "inspircd_config.h"
+#include "inspircd.h"
 #ifdef HAS_STDINT
 #include <stdint.h>
 #endif
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-
 #include "m_hash.h"
 
 #ifndef HAS_STDINT
@@ -139,7 +137,7 @@ 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* key)
 	{
 		if (key)
 		{
@@ -155,7 +153,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];
@@ -189,7 +187,7 @@ class ModuleSHA256 : public Module
 		}
 	}
 	
-	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;
 		memcpy(&ctx->block[ctx->len], message, rem_len);
@@ -209,7 +207,7 @@ class ModuleSHA256 : public Module
 		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;
@@ -226,7 +224,7 @@ class ModuleSHA256 : public Module
 	{
 		// Generate the hash
 		unsigned char bytehash[SHA256_DIGEST_SIZE];
-		struct SHA256Context ctx;
+		SHA256Context ctx;
 		SHA256Init(&ctx, key);
 		SHA256Update(&ctx, (unsigned char *)src, (unsigned int)len);
 		SHA256Final(&ctx, bytehash);
@@ -244,7 +242,7 @@ class ModuleSHA256 : public Module
 
  public:
 
-	ModuleSHA256(InspIRCd* Me) : Module::Module(Me), key(NULL), chars(NULL)
+	ModuleSHA256(InspIRCd* Me) : Module(Me), key(NULL), chars(NULL)
 	{
 		ServerInstance->PublishInterface("HashRequest", this);
 	}
@@ -294,26 +292,5 @@ class ModuleSHA256 : public Module
 	}
 };
 
+MODULE_INIT(ModuleSHA256)
 
-class ModuleSHA256Factory : public ModuleFactory
-{
-public:
-	ModuleSHA256Factory()
-	{
-	}
-
-	~ModuleSHA256Factory()
-	{
-	}
-
-	virtual Module *CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSHA256(Me);
-	}
-
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSHA256Factory;
-}