X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4fbc579a1eef24404d25d8b855d733ac03f2b9c5..1eb2acd21f33865e5a3b27b5ec3e91a6ccc17ff1:/src/xbt/xbt_sha.c diff --git a/src/xbt/xbt_sha.c b/src/xbt/xbt_sha.c index de3522fa8a..d6223e2692 100644 --- 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 . 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" @@ -57,7 +58,7 @@ void xbt_sha_reset(xbt_sha_t sha) /* @brief Add some more data to the buffer */ void xbt_sha_feed(xbt_sha_t sha, const unsigned char *data, size_t len) { - int i; + unsigned int i; for (i = 0; i < len; i++) { sha->buf[sha->blen / 4] <<= 8; @@ -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; } @@ -176,7 +177,7 @@ static void sha_calculate(xbt_sha_t sha) /* ************* */ #ifdef SIMGRID_TEST #include "xbt/hash.h" -#include "portable.h" /* hexa_str */ +#include "src/portable.h" /* hexa_str */ static char *mycmp(const char *p1, const char *p2, size_t n) {