diff options
author | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-03-18 16:07:40 +0100 |
---|---|---|
committer | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-03-18 16:07:40 +0100 |
commit | c4ccd75504124e816264597fe21c892b33919819 (patch) | |
tree | 351a2de1468abe9ed7a5a0359768b593c8d72a70 | |
parent | f9ae0c23ccd894f6422b0b21841cd65c01e831d3 (diff) | |
download | gnunet-c4ccd75504124e816264597fe21c892b33919819.tar.gz gnunet-c4ccd75504124e816264597fe21c892b33919819.zip |
Setu tests use gnunet internal functions to generate randum elements
-rw-r--r-- | src/setu/test_setu_api.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/setu/test_setu_api.c b/src/setu/test_setu_api.c index bfef88908..02c5ddf87 100644 --- a/src/setu/test_setu_api.c +++ b/src/setu/test_setu_api.c | |||
@@ -210,12 +210,8 @@ init_set2 (void *cls) | |||
210 | 210 | ||
211 | unsigned char *gen_rdm_bytestream (size_t num_bytes) | 211 | unsigned char *gen_rdm_bytestream (size_t num_bytes) |
212 | { | 212 | { |
213 | unsigned char *stream = malloc (num_bytes); | 213 | unsigned char *stream = GNUNET_malloc (num_bytes); |
214 | size_t i; | 214 | GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, sizeof(stream)); |
215 | for (i = 0; i < num_bytes; i++) | ||
216 | { | ||
217 | stream[i] = rand (); | ||
218 | } | ||
219 | return stream; | 215 | return stream; |
220 | } | 216 | } |
221 | 217 | ||
@@ -253,12 +249,15 @@ initRandomSets(int overlap, int set1_size, int set2_size, int element_size_in_by | |||
253 | while(set2_size > 0) { | 249 | while(set2_size > 0) { |
254 | element.data = gen_rdm_bytestream(element_size_in_bytes); | 250 | element.data = gen_rdm_bytestream(element_size_in_bytes); |
255 | element.size = strlen (element.data); | 251 | element.size = strlen (element.data); |
256 | GNUNET_SETU_add_element (set2, &element,NULL, NULL); | 252 | |
253 | if(set2_size != 1) { | ||
254 | GNUNET_SETU_add_element (set2, &element,NULL, NULL); | ||
255 | } else { | ||
256 | GNUNET_SETU_add_element (set2, &element,&start, NULL); | ||
257 | } | ||
258 | |||
257 | set2_size--; | 259 | set2_size--; |
258 | } | 260 | } |
259 | element.data = gen_rdm_bytestream(element_size_in_bytes); | ||
260 | element.size = strlen (element.data); | ||
261 | GNUNET_SETU_add_element (set2, &element,&start, NULL); | ||
262 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in set2\n"); | 261 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in set2\n"); |
263 | } | 262 | } |
264 | 263 | ||