/*
This file is part of GNUnet.
- (C) 2002, 2003, 2004, 2006, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2002, 2003, 2004, 2006, 2013 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
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
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.
*/
/**
* @brief measure performance of KDF hash function
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include <gcrypt.h>
#include <gauger.h>
size_t buf_len,
struct GNUNET_HashCode *result)
{
- GNUNET_break (0 ==
+ GNUNET_break (0 ==
gcry_kdf_derive (buf, buf_len,
- GCRY_KDF_PBKDF2 /* FIX: use SCRYPT! */,
+ GCRY_KDF_SCRYPT,
1 /* subalgo */,
"gnunet-proof-of-work", strlen ("gnunet-proof-of-work"),
2 /* iterations; keep cost of individual op small */,
GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start),
GNUNET_YES));
GAUGER ("NSE", "Proof-of-work hashing",
- 1024 / (1 +
+ 1024.0 / (1.0 +
GNUNET_TIME_absolute_get_duration
- (start).rel_value), "hashes/s");
+ (start).rel_value_us / 1000.0), "hashes/ms");
return 0;
}