[mc] Cleanup mc_hash

[simgrid.git] / src / xbt / xbt_sha.c

diff --git a/src/xbt/xbt_sha.c b/src/xbt/xbt_sha.c
index 29016d9..6290cd9 100644 (file)
--- a/src/xbt/xbt_sha.c
+++ b/src/xbt/xbt_sha.c
@@ -1,16 +1,17 @@
 /* xbt_sha.c - SHA1 hash function */
 
+/* Copyright (c) 2008-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 /* Initial version part of iksemel (XML parser for Jabber)
  *   Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>. All right reserved.
  *   Distributed under LGPL v2.1, February 1999.
  */
 
 /* Later adapted to fit into SimGrid. Distributed under LGPL v2.1, Feb 1999.*/
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved.                                                     */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/sysdep.h"
 #include "xbt/hash.h"
@@ -99,7 +100,7 @@ static void xbt_sha_finalize(xbt_sha_t sha)
 /** @brief returns the sha hash into a newly allocated buffer (+ reset sha object) */
 char *xbt_sha_read(xbt_sha_t sha)
 {
-  char *res = xbt_malloc(40);
+  char *res = xbt_malloc(41);
   xbt_sha_print(sha, res);
   return res;
 }
@@ -195,16 +196,13 @@ static void test_sha(const char *clear, const char *hashed)
   char hash[41];
   xbt_sha(clear, hash);
 
-  xbt_test_add1("==== Test with '%s'", clear);
-  xbt_test_assert3(!memcmp(hash, hashed, 40), "Wrong sha: %40s!=%40s (%s)",
+  xbt_test_add("==== Test with '%s'", clear);
+  xbt_test_assert(!memcmp(hash, hashed, 40), "Wrong sha: %40s!=%40s (%s)",
                    hash, hashed, mycmp(hash, hashed, 40));
 }
 
 XBT_TEST_SUITE("hash", "Various hash functions");
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(hash, "Tests of various hash functions ");
-
-
 XBT_TEST_UNIT("sha", test_crypto_sha, "Test of the sha algorithm")
 {
   /* Empty string as test vector */