diff options
Diffstat (limited to 'src/util/test_crypto_ksk.c')
-rw-r--r-- | src/util/test_crypto_ksk.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/src/util/test_crypto_ksk.c b/src/util/test_crypto_ksk.c index 184f9f137..d4340f3ea 100644 --- a/src/util/test_crypto_ksk.c +++ b/src/util/test_crypto_ksk.c | |||
@@ -66,9 +66,8 @@ testCorrectKey () | |||
66 | snprintf (out, sizeof (out), "%02x", ((unsigned char *) &pkey)[i]); | 66 | snprintf (out, sizeof (out), "%02x", ((unsigned char *) &pkey)[i]); |
67 | if (0 != strncmp (out, &want[i * 2], 2)) | 67 | if (0 != strncmp (out, &want[i * 2], 2)) |
68 | { | 68 | { |
69 | fprintf (stderr, | 69 | fprintf (stderr, " Failed! Wanted %.2s but got %2s at %d\n", &want[i * 2], |
70 | " Failed! Wanted %.2s but got %2s at %d\n", | 70 | out, i); |
71 | &want[i * 2], out, i); | ||
72 | return GNUNET_SYSERR; | 71 | return GNUNET_SYSERR; |
73 | } | 72 | } |
74 | } | 73 | } |
@@ -144,17 +143,17 @@ testEncryptDecrypt (struct GNUNET_CRYPTO_RsaPrivateKey *hostkey) | |||
144 | for (i = 0; i < ITER; i++) | 143 | for (i = 0; i < ITER; i++) |
145 | { | 144 | { |
146 | fprintf (stderr, "."); | 145 | fprintf (stderr, "."); |
147 | if (GNUNET_SYSERR == GNUNET_CRYPTO_rsa_encrypt (TESTSTRING, | 146 | if (GNUNET_SYSERR == |
148 | strlen (TESTSTRING) + 1, | 147 | GNUNET_CRYPTO_rsa_encrypt (TESTSTRING, strlen (TESTSTRING) + 1, &pkey, |
149 | &pkey, &target)) | 148 | &target)) |
150 | { | 149 | { |
151 | fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n"); | 150 | fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n"); |
152 | ok++; | 151 | ok++; |
153 | continue; | 152 | continue; |
154 | } | 153 | } |
155 | if (-1 == GNUNET_CRYPTO_rsa_decrypt (hostkey, | 154 | if (-1 == |
156 | &target, result, | 155 | GNUNET_CRYPTO_rsa_decrypt (hostkey, &target, result, |
157 | strlen (TESTSTRING) + 1)) | 156 | strlen (TESTSTRING) + 1)) |
158 | { | 157 | { |
159 | fprintf (stderr, "GNUNET_CRYPTO_rsa_decrypt returned SYSERR\n"); | 158 | fprintf (stderr, "GNUNET_CRYPTO_rsa_decrypt returned SYSERR\n"); |
160 | ok++; | 159 | ok++; |
@@ -162,16 +161,15 @@ testEncryptDecrypt (struct GNUNET_CRYPTO_RsaPrivateKey *hostkey) | |||
162 | } | 161 | } |
163 | if (strncmp (TESTSTRING, result, strlen (TESTSTRING)) != 0) | 162 | if (strncmp (TESTSTRING, result, strlen (TESTSTRING)) != 0) |
164 | { | 163 | { |
165 | printf ("%s != %.*s - testEncryptDecrypt failed!\n", | 164 | printf ("%s != %.*s - testEncryptDecrypt failed!\n", TESTSTRING, |
166 | TESTSTRING, MAX_TESTVAL, result); | 165 | MAX_TESTVAL, result); |
167 | ok++; | 166 | ok++; |
168 | continue; | 167 | continue; |
169 | } | 168 | } |
170 | } | 169 | } |
171 | printf ("%d RSA encrypt/decrypt operations %llums (%d failures)\n", | 170 | printf ("%d RSA encrypt/decrypt operations %llums (%d failures)\n", ITER, |
172 | ITER, | 171 | (unsigned long long) GNUNET_TIME_absolute_get_duration (start). |
173 | (unsigned long long) | 172 | rel_value, ok); |
174 | GNUNET_TIME_absolute_get_duration (start).rel_value, ok); | ||
175 | if (ok == 0) | 173 | if (ok == 0) |
176 | return GNUNET_OK; | 174 | return GNUNET_OK; |
177 | else | 175 | else |
@@ -203,26 +201,25 @@ testSignVerify (struct GNUNET_CRYPTO_RsaPrivateKey *hostkey) | |||
203 | continue; | 201 | continue; |
204 | } | 202 | } |
205 | if (GNUNET_SYSERR == | 203 | if (GNUNET_SYSERR == |
206 | GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, | 204 | GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, &purp, &sig, |
207 | &purp, &sig, &pkey)) | 205 | &pkey)) |
208 | { | 206 | { |
209 | printf ("GNUNET_CRYPTO_rsa_verify failed!\n"); | 207 | printf ("GNUNET_CRYPTO_rsa_verify failed!\n"); |
210 | ok = GNUNET_SYSERR; | 208 | ok = GNUNET_SYSERR; |
211 | continue; | 209 | continue; |
212 | } | 210 | } |
213 | if (GNUNET_SYSERR != | 211 | if (GNUNET_SYSERR != |
214 | GNUNET_CRYPTO_rsa_verify | 212 | GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, |
215 | (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, &purp, &sig, &pkey)) | 213 | &purp, &sig, &pkey)) |
216 | { | 214 | { |
217 | printf ("GNUNET_CRYPTO_rsa_verify failed to fail!\n"); | 215 | printf ("GNUNET_CRYPTO_rsa_verify failed to fail!\n"); |
218 | ok = GNUNET_SYSERR; | 216 | ok = GNUNET_SYSERR; |
219 | continue; | 217 | continue; |
220 | } | 218 | } |
221 | } | 219 | } |
222 | printf ("%d RSA sign/verify operations %llums\n", | 220 | printf ("%d RSA sign/verify operations %llums\n", ITER, |
223 | ITER, | 221 | (unsigned long long) GNUNET_TIME_absolute_get_duration (start). |
224 | (unsigned long long) | 222 | rel_value); |
225 | GNUNET_TIME_absolute_get_duration (start).rel_value); | ||
226 | return ok; | 223 | return ok; |
227 | } | 224 | } |
228 | 225 | ||