diff options
Diffstat (limited to 'src/util/test_crypto_eddsa.c')
-rw-r--r-- | src/util/test_crypto_eddsa.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c index 209eea5c6..eda285af8 100644 --- a/src/util/test_crypto_eddsa.c +++ b/src/util/test_crypto_eddsa.c | |||
@@ -56,7 +56,7 @@ testSignVerify () | |||
56 | 56 | ||
57 | for (i = 0; i < ITER; i++) | 57 | for (i = 0; i < ITER; i++) |
58 | { | 58 | { |
59 | FPRINTF (stderr, "%s", "."); | 59 | FPRINTF (stderr, "%s", "."); fflush (stderr); |
60 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign (key, &purp, &sig)) | 60 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign (key, &purp, &sig)) |
61 | { | 61 | { |
62 | FPRINTF (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); | 62 | FPRINTF (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); |
@@ -80,7 +80,7 @@ testSignVerify () | |||
80 | continue; | 80 | continue; |
81 | } | 81 | } |
82 | } | 82 | } |
83 | printf ("%d ECC sign/verify operations %s\n", ITER, | 83 | printf ("%d EdDSA sign/verify operations %s\n", ITER, |
84 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES)); | 84 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES)); |
85 | return ok; | 85 | return ok; |
86 | } | 86 | } |
@@ -104,7 +104,7 @@ testSignPerformance () | |||
104 | start = GNUNET_TIME_absolute_get (); | 104 | start = GNUNET_TIME_absolute_get (); |
105 | for (i = 0; i < ITER; i++) | 105 | for (i = 0; i < ITER; i++) |
106 | { | 106 | { |
107 | FPRINTF (stderr, "%s", "."); | 107 | FPRINTF (stderr, "%s", "."); fflush (stderr); |
108 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign (key, &purp, &sig)) | 108 | if (GNUNET_SYSERR == GNUNET_CRYPTO_eddsa_sign (key, &purp, &sig)) |
109 | { | 109 | { |
110 | FPRINTF (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); | 110 | FPRINTF (stderr, "%s", "GNUNET_CRYPTO_eddsa_sign returned SYSERR\n"); |
@@ -152,15 +152,18 @@ perf_keygen () | |||
152 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; | 152 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; |
153 | int i; | 153 | int i; |
154 | 154 | ||
155 | FPRINTF (stderr, "%s", "W"); | ||
155 | start = GNUNET_TIME_absolute_get (); | 156 | start = GNUNET_TIME_absolute_get (); |
156 | for (i=0;i<10;i++) | 157 | for (i=0;i<10;i++) |
157 | { | 158 | { |
158 | fprintf (stderr, "."); | 159 | fprintf (stderr, "."); fflush (stderr); |
159 | pk = GNUNET_CRYPTO_eddsa_key_create (); | 160 | pk = GNUNET_CRYPTO_eddsa_key_create (); |
160 | GNUNET_free (pk); | 161 | GNUNET_free (pk); |
161 | } | 162 | } |
162 | fprintf (stderr, "\n"); | 163 | for (;i<25;i++) |
163 | printf ("Creating 10 EdDSA keys took %s\n", | 164 | fprintf (stderr, "."); |
165 | fflush (stderr); | ||
166 | printf ("10 EdDSA keys created in %s\n", | ||
164 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES)); | 167 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (start), GNUNET_YES)); |
165 | } | 168 | } |
166 | 169 | ||
@@ -170,13 +173,15 @@ main (int argc, char *argv[]) | |||
170 | { | 173 | { |
171 | int failure_count = 0; | 174 | int failure_count = 0; |
172 | 175 | ||
173 | if (! gcry_check_version ("1.5.0")) | 176 | if (! gcry_check_version ("1.6.0")) |
174 | { | 177 | { |
175 | FPRINTF (stderr, | 178 | FPRINTF (stderr, |
176 | _("libgcrypt has not the expected version (version %s is required).\n"), | 179 | _("libgcrypt has not the expected version (version %s is required).\n"), |
177 | "1.5.0"); | 180 | "1.6.0"); |
178 | return 0; | 181 | return 0; |
179 | } | 182 | } |
183 | if (getenv ("GNUNET_GCRYPT_DEBUG")) | ||
184 | gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u , 0); | ||
180 | GNUNET_log_setup ("test-crypto-eddsa", "WARNING", NULL); | 185 | GNUNET_log_setup ("test-crypto-eddsa", "WARNING", NULL); |
181 | key = GNUNET_CRYPTO_eddsa_key_create (); | 186 | key = GNUNET_CRYPTO_eddsa_key_create (); |
182 | #if PERF | 187 | #if PERF |