From 0f4f272e889c4269e5564a74b0c63c3d92bc5916 Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 6 Jan 2008 18:37:23 +0000 Subject: 90% sure this fix will mean SHA256 works consistantly. Was a problem in SHA256Update(). git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8651 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_sha256.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp index ad7352060..08ecf4594 100644 --- a/src/modules/m_sha256.cpp +++ b/src/modules/m_sha256.cpp @@ -186,7 +186,26 @@ class ModuleSHA256 : public Module 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) { -- cgit v1.2.3