X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_crypto_hash.c;h=731205841c50bfb17c4c9928734776f6c2ab21de;hb=4707789ebfb4cef9672db31e3ceb8f98381901d0;hp=2a5d6d773b5bc5397b6774974a7c12e049c8a0b6;hpb=05ef63d9f8cf65561b7ed2234efdc80e3fb40bd0;p=oweals%2Fgnunet.git diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c index 2a5d6d773..731205841 100644 --- a/src/util/test_crypto_hash.c +++ b/src/util/test_crypto_hash.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2002, 2003, 2004, 2006, 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2002, 2003, 2004, 2006, 2009 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -24,9 +24,7 @@ * @brief Test for crypto_hash.c */ #include "platform.h" -#include "gnunet_common.h" -#include "gnunet_crypto_lib.h" -#include "gnunet_scheduler_lib.h" +#include "gnunet_util_lib.h" static char block[65536]; @@ -69,8 +67,8 @@ testArithmetic () struct GNUNET_HashCode h2; struct GNUNET_HashCode d; struct GNUNET_HashCode s; - struct GNUNET_CRYPTO_AesSessionKey skey; - struct GNUNET_CRYPTO_AesInitializationVector iv; + struct GNUNET_CRYPTO_SymmetricSessionKey skey; + struct GNUNET_CRYPTO_SymmetricInitializationVector iv; GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &h1); GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &h2); @@ -116,7 +114,7 @@ finished_task (void *cls, const struct GNUNET_HashCode * res) static void -file_hasher (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +file_hasher (void *cls) { GNUNET_assert (NULL != GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_DEFAULT,