A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3_9_90' into hypervisor
[simgrid.git]
/
src
/
xbt
/
xbt_sha.c
diff --git
a/src/xbt/xbt_sha.c
b/src/xbt/xbt_sha.c
index
12fa575
..
d03cd89
100644
(file)
--- a/
src/xbt/xbt_sha.c
+++ b/
src/xbt/xbt_sha.c
@@
-1,11
+1,13
@@
-/* $Id$ */
/* xbt_sha.c - SHA1 hash function */
/* Initial version part of iksemel (XML parser for Jabber)
/* xbt_sha.c - SHA1 hash function */
/* Initial version part of iksemel (XML parser for Jabber)
- * Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>. All right reserved. */
+ * Copyright (C) 2000-2003 Gurer Ozen <madcat@e-kolay.net>. All right reserved.
+ * Distributed under LGPL v2.1, February 1999.
+ */
-/* Adapted to fit into SimGrid by Martin Quinson.
- Copyright (c) 2008 Martin Quinson. All rights reserved. */
+/* Later adapted to fit into SimGrid. Distributed under LGPL v2.1, Feb 1999.*/
+/* Copyright (c) 2008-2013. 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. */
/* 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. */
@@
-97,7
+99,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)
{
/** @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(4
0
);
+ char *res = xbt_malloc(4
1
);
xbt_sha_print(sha, res);
return res;
}
xbt_sha_print(sha, res);
return res;
}
@@
-148,8
+150,8
@@
static void sha_calculate(xbt_sha_t sha)
for (i = 16; i < 80; i++)
sha->buf[i] =
for (i = 16; i < 80; i++)
sha->buf[i] =
- SRL(sha->buf[i - 3] ^ sha->buf[i - 8] ^ sha->
- buf[i - 14] ^ sha->buf[i - 16], 1);
+
SRL(sha->buf[i - 3] ^ sha->buf[i - 8] ^ sha->
+
buf[i - 14] ^ sha->buf[i - 16], 1);
A = sha->hash[0];
B = sha->hash[1];
A = sha->hash[0];
B = sha->hash[1];
@@
-193,16
+195,13
@@
static void test_sha(const char *clear, const char *hashed)
char hash[41];
xbt_sha(clear, hash);
char hash[41];
xbt_sha(clear, hash);
- xbt_test_add
1
("==== Test with '%s'", clear);
- xbt_test_assert
3
(!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");
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 */
XBT_TEST_UNIT("sha", test_crypto_sha, "Test of the sha algorithm")
{
/* Empty string as test vector */
@@
-217,4
+216,4
@@
XBT_TEST_UNIT("sha", test_crypto_sha, "Test of the sha algorithm")
"373ba8be29d4d95708bf7cd43038f4e409dcb439");
}
"373ba8be29d4d95708bf7cd43038f4e409dcb439");
}
-#endif /* SIMGRID_TEST */
+#endif
/* SIMGRID_TEST */