Merge 0.9->trunk

[prosody.git] / util-src / hashes.c

diff --git a/util-src/hashes.c b/util-src/hashes.c
index 79ef227f70360dfb6147913dddd09e0ba6a13b69..317deaf3899b8ac86435c2b9f66491dc6d7fc8d3 100644 (file)
--- a/util-src/hashes.c
+++ b/util-src/hashes.c
@@ -1,6 +1,6 @@
-/* Prosody IM v0.3
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+/* Prosody IM
+-- Copyright (C) 2009-2010 Matthew Wild
+-- Copyright (C) 2009-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -46,14 +46,20 @@ static int myFunc(lua_State *L) { \
        return 1; \
 }
 
-MAKE_HASH_FUNCTION(Lsha1, SHA1, 20)
-MAKE_HASH_FUNCTION(Lsha256, SHA256, 32)
-MAKE_HASH_FUNCTION(Lmd5, MD5, 16)
+MAKE_HASH_FUNCTION(Lsha1, SHA1, SHA_DIGEST_LENGTH)
+MAKE_HASH_FUNCTION(Lsha224, SHA224, SHA224_DIGEST_LENGTH)
+MAKE_HASH_FUNCTION(Lsha256, SHA256, SHA256_DIGEST_LENGTH)
+MAKE_HASH_FUNCTION(Lsha384, SHA384, SHA384_DIGEST_LENGTH)
+MAKE_HASH_FUNCTION(Lsha512, SHA512, SHA512_DIGEST_LENGTH)
+MAKE_HASH_FUNCTION(Lmd5, MD5, MD5_DIGEST_LENGTH)
 
 static const luaL_Reg Reg[] =
 {
        { "sha1",       Lsha1   },
+       { "sha224",     Lsha224 },
        { "sha256",     Lsha256 },
+       { "sha384",     Lsha384 },
+       { "sha512",     Lsha512 },
        { "md5",        Lmd5    },
        { NULL,         NULL    }
 };