[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 05/31: revert
From: |
gnunet |
Subject: |
[gnunet] 05/31: revert |
Date: |
Wed, 22 Apr 2020 21:52:56 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 91cccda131a12be139d50effe4657c6b24e36135
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Apr 17 22:55:52 2020 +0200
revert
---
src/util/crypto_pow.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/util/crypto_pow.c b/src/util/crypto_pow.c
index 435bf34d6..5e225f244 100644
--- a/src/util/crypto_pow.c
+++ b/src/util/crypto_pow.c
@@ -102,15 +102,15 @@ GNUNET_CRYPTO_pow_hash (const char *salt,
struct GNUNET_CRYPTO_SymmetricSessionKey skey;
char rbuf[buf_len];
- GNUNET_break (ARGON2_OK == argon2d_hash_raw (buf,
- buf_len,
- GCRY_KDF_SCRYPT,
- 1 /* subalgo */,
- salt,
- strlen (salt),
- 2 /* iterations; keep cost of
individual op small */,
- sizeof(skey),
- &skey));
+ GNUNET_break (0 == gcry_kdf_derive (buf,
+ buf_len,
+ GCRY_KDF_SCRYPT,
+ 1 /* subalgo */,
+ salt,
+ strlen (salt),
+ 2 /* iterations; keep cost of individual
op small */,
+ sizeof(skey),
+ &skey));
GNUNET_CRYPTO_symmetric_derive_iv (&iv,
&skey,
"gnunet-proof-of-work-iv",
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnunet] branch master updated (bf99d2243 -> f225e5688), gnunet, 2020/04/22
- [gnunet] 04/31: merge, gnunet, 2020/04/22
- [gnunet] 01/31: add argon2 for LSD0001, gnunet, 2020/04/22
- [gnunet] 03/31: update params, gnunet, 2020/04/22
- [gnunet] 02/31: add argon2 for LSD0001, gnunet, 2020/04/22
- [gnunet] 07/31: towards more expirations, gnunet, 2020/04/22
- [gnunet] 05/31: revert,
gnunet <=
- [gnunet] 06/31: simplify pow even more; add timestamp to revocation pow, gnunet, 2020/04/22
- [gnunet] 09/31: no diplicate nonces, gnunet, 2020/04/22
- [gnunet] 11/31: uncrustify, gnunet, 2020/04/22
- [gnunet] 12/31: those are actually debug messages, gnunet, 2020/04/22
- [gnunet] 13/31: more comments, allow to pick up pow later, gnunet, 2020/04/22
- [gnunet] 18/31: fix, gnunet, 2020/04/22
- [gnunet] 10/31: some comments, gnunet, 2020/04/22
- [gnunet] 25/31: packed makes no sense there, gnunet, 2020/04/22
- [gnunet] 19/31: check signature in check_pow, gnunet, 2020/04/22
- [gnunet] 14/31: evaluate epochs, gnunet, 2020/04/22