aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/gnunet_crypto_lib.h8
-rw-r--r--src/util/crypto_cs.c8
-rw-r--r--src/util/perf_crypto_cs.c8
-rw-r--r--src/util/perf_crypto_rsa.c1
-rw-r--r--src/util/test_crypto_cs.c10
5 files changed, 15 insertions, 20 deletions
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 9c71edaab..bd318ab84 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -2607,7 +2607,6 @@ void
2607GNUNET_CRYPTO_cs_r_get_public (const struct GNUNET_CRYPTO_CsRSecret *r_priv, 2607GNUNET_CRYPTO_cs_r_get_public (const struct GNUNET_CRYPTO_CsRSecret *r_priv,
2608 struct GNUNET_CRYPTO_CsRPublic *r_pub); 2608 struct GNUNET_CRYPTO_CsRPublic *r_pub);
2609 2609
2610
2611/** 2610/**
2612 * Derives new random blinding factors. 2611 * Derives new random blinding factors.
2613 * In original papers blinding factors are generated randomly 2612 * In original papers blinding factors are generated randomly
@@ -2615,13 +2614,12 @@ GNUNET_CRYPTO_cs_r_get_public (const struct GNUNET_CRYPTO_CsRSecret *r_priv,
2615 * To ensure unpredictability a new nonce has to be used. 2614 * To ensure unpredictability a new nonce has to be used.
2616 * Uses HKDF internally 2615 * Uses HKDF internally
2617 * 2616 *
2618 * @param secret is secret to derive blinding factors 2617 * @param blind_seed is the blinding seed to derive blinding factors
2619 * @param secret_len secret length
2620 * @param[out] bs array containing the two derived blinding secrets 2618 * @param[out] bs array containing the two derived blinding secrets
2621 */ 2619 */
2622void 2620void
2623GNUNET_CRYPTO_cs_blinding_secrets_derive (const void *secret, 2621GNUNET_CRYPTO_cs_blinding_secrets_derive (const struct
2624 size_t secret_len, 2622 GNUNET_CRYPTO_CsNonce *blind_seed,
2625 struct GNUNET_CRYPTO_CsBlindingSecret 2623 struct GNUNET_CRYPTO_CsBlindingSecret
2626 bs[2]); 2624 bs[2]);
2627 2625
diff --git a/src/util/crypto_cs.c b/src/util/crypto_cs.c
index 5c441b669..c89ba5d83 100644
--- a/src/util/crypto_cs.c
+++ b/src/util/crypto_cs.c
@@ -147,8 +147,8 @@ GNUNET_CRYPTO_cs_r_get_public (const struct GNUNET_CRYPTO_CsRSecret *r_priv,
147 * @param[out] bs array containing the two derived blinding secrets 147 * @param[out] bs array containing the two derived blinding secrets
148 */ 148 */
149void 149void
150GNUNET_CRYPTO_cs_blinding_secrets_derive (const void *secret, 150GNUNET_CRYPTO_cs_blinding_secrets_derive (const struct
151 size_t secret_len, 151 GNUNET_CRYPTO_CsNonce *blind_seed,
152 struct GNUNET_CRYPTO_CsBlindingSecret 152 struct GNUNET_CRYPTO_CsBlindingSecret
153 bs[2]) 153 bs[2])
154{ 154{
@@ -161,8 +161,8 @@ GNUNET_CRYPTO_cs_blinding_secrets_derive (const void *secret,
161 GCRY_MD_SHA256, 161 GCRY_MD_SHA256,
162 "alphabeta", 162 "alphabeta",
163 strlen ("alphabeta"), 163 strlen ("alphabeta"),
164 secret, 164 blind_seed,
165 secret_len, 165 sizeof(*blind_seed),
166 NULL, 166 NULL,
167 0)); 167 0));
168 map_to_scalar_subgroup (&bs[0].alpha); 168 map_to_scalar_subgroup (&bs[0].alpha);
diff --git a/src/util/perf_crypto_cs.c b/src/util/perf_crypto_cs.c
index a8c72052b..54c9c8e0e 100644
--- a/src/util/perf_crypto_cs.c
+++ b/src/util/perf_crypto_cs.c
@@ -103,8 +103,6 @@ eval ()
103 for (i = 0; i < ITER; i++) 103 for (i = 0; i < ITER; i++)
104 { 104 {
105 GNUNET_CRYPTO_cs_blinding_secrets_derive (&nonce, 105 GNUNET_CRYPTO_cs_blinding_secrets_derive (&nonce,
106 sizeof(struct
107 GNUNET_CRYPTO_CsNonce),
108 bs); 106 bs);
109 } 107 }
110 printf ("10x derive blinding secrets took %s\n", 108 printf ("10x derive blinding secrets took %s\n",
@@ -167,9 +165,9 @@ eval ()
167 for (i = 0; i < ITER; i++) 165 for (i = 0; i < ITER; i++)
168 { 166 {
169 GNUNET_CRYPTO_cs_verify (&sig, 167 GNUNET_CRYPTO_cs_verify (&sig,
170 &pub, 168 &pub,
171 message, 169 message,
172 message_len); 170 message_len);
173 } 171 }
174 printf ("10x verifying signatures took %s\n", 172 printf ("10x verifying signatures took %s\n",
175 GNUNET_STRINGS_relative_time_to_string ( 173 GNUNET_STRINGS_relative_time_to_string (
diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c
index aba61786f..a3e041bdf 100644
--- a/src/util/perf_crypto_rsa.c
+++ b/src/util/perf_crypto_rsa.c
@@ -203,6 +203,7 @@ main (int argc, char *argv[])
203{ 203{
204 eval (1024); 204 eval (1024);
205 eval (2048); 205 eval (2048);
206 eval (3072);
206 /* eval (4096); */ 207 /* eval (4096); */
207 return 0; 208 return 0;
208} 209}
diff --git a/src/util/test_crypto_cs.c b/src/util/test_crypto_cs.c
index 2978fec0a..d3406516e 100644
--- a/src/util/test_crypto_cs.c
+++ b/src/util/test_crypto_cs.c
@@ -148,8 +148,7 @@ test_generate_rpublic (const struct GNUNET_CRYPTO_CsRSecret *r_priv,
148 148
149 149
150void 150void
151test_derive_blindingsecrets (const void *secret, 151test_derive_blindingsecrets (const struct GNUNET_CRYPTO_CsNonce *blind_seed,
152 size_t secret_len,
153 struct GNUNET_CRYPTO_CsBlindingSecret bs[2]) 152 struct GNUNET_CRYPTO_CsBlindingSecret bs[2])
154{ 153{
155 /* TEST 1 154 /* TEST 1
@@ -159,7 +158,7 @@ test_derive_blindingsecrets (const void *secret,
159 memcpy (&other_bs[0], &bs[0], sizeof(struct GNUNET_CRYPTO_CsBlindingSecret) 158 memcpy (&other_bs[0], &bs[0], sizeof(struct GNUNET_CRYPTO_CsBlindingSecret)
160 * 2); 159 * 2);
161 160
162 GNUNET_CRYPTO_cs_blinding_secrets_derive (secret, secret_len, bs); 161 GNUNET_CRYPTO_cs_blinding_secrets_derive (blind_seed, bs);
163 162
164 GNUNET_assert (0 != memcmp (&other_bs[0], 163 GNUNET_assert (0 != memcmp (&other_bs[0],
165 &bs[0], 164 &bs[0],
@@ -173,7 +172,7 @@ test_derive_blindingsecrets (const void *secret,
173 memcpy (&other_bs[0], &bs[0], sizeof(struct GNUNET_CRYPTO_CsBlindingSecret) 172 memcpy (&other_bs[0], &bs[0], sizeof(struct GNUNET_CRYPTO_CsBlindingSecret)
174 * 2); 173 * 2);
175 for (int i = 0; i<ITER; i++) { 174 for (int i = 0; i<ITER; i++) {
176 GNUNET_CRYPTO_cs_blinding_secrets_derive (secret, secret_len, bs); 175 GNUNET_CRYPTO_cs_blinding_secrets_derive (blind_seed, bs);
177 GNUNET_assert (0 == memcmp (&other_bs[0], 176 GNUNET_assert (0 == memcmp (&other_bs[0],
178 &bs[0], 177 &bs[0],
179 sizeof(struct GNUNET_CRYPTO_CsBlindingSecret) 178 sizeof(struct GNUNET_CRYPTO_CsBlindingSecret)
@@ -493,8 +492,7 @@ main (int argc,
493 // generate blinding secrets 492 // generate blinding secrets
494 struct GNUNET_CRYPTO_CsBlindingSecret blindingsecrets[2]; 493 struct GNUNET_CRYPTO_CsBlindingSecret blindingsecrets[2];
495 test_derive_blindingsecrets (&nonce, 494 test_derive_blindingsecrets (&nonce,
496 sizeof(nonce), 495 blindingsecrets);
497 blindingsecrets);
498 496
499 // calculate blinded c's 497 // calculate blinded c's
500 struct GNUNET_CRYPTO_CsC blinded_cs[2]; 498 struct GNUNET_CRYPTO_CsC blinded_cs[2];