summaryrefslogtreecommitdiff
path: root/src/modules/m_sha256.cpp
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-06 18:37:23 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-01-06 18:37:23 +0000
commit0f4f272e889c4269e5564a74b0c63c3d92bc5916 (patch)
tree086a0bb430bc933cfceec9f4eba6d02a4025d961 /src/modules/m_sha256.cpp
parente7f33ba1896482367d01379e84d5496631229741 (diff)
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
Diffstat (limited to 'src/modules/m_sha256.cpp')
-rw-r--r--src/modules/m_sha256.cpp21
1 files changed, 20 insertions, 1 deletions
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)
{