Skip to content

Commit b178138

Browse files
douzzerdouzzer
committed
src/internal.c: in wolfSSL_ERR_reason_error_string(), add missing error string for SCR_DIFFERENT_CERT_E, and de-gate error strings previously gated on HAVE_HTTP_CLIENT.
tests/api.c: add error_test() adapted from wolfcrypt/test/test.c, checking all error strings for expected presence/absence and length, called from existing test_wolfSSL_ERR_strings(). wolfssl/ssl.h, wolfssl/error-ssl.h, and wolfssl/wolfcrypt/error-crypt.h: * move several negative error return codes from ssl.h to error-ssl.h, * renumber them to conform to existing sequence, and * include error-ssl.h from ssl.h; * add special-case WOLFSSL_DEBUG_TRACE_ERROR_CODES macros for WOLFSSL_FAILURE; * add missing WOLFSSL_API attribute to wc_backtrace_render(). add numerous WC_NO_ERR_TRACE()s to operand error code uses, cleaning up error traces in general, and particularly when WOLFSSL_DEBUG_TRACE_ERROR_CODES_ALWAYS. * crypto lib (36), * crypto test&benchmark (20), * TLS lib (179), * examples (122), * linuxkm (3), * tests/api.c (2272).
1 parent d4f6b5b commit b178138

42 files changed

Lines changed: 2879 additions & 2683 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/async/async_client.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ int client_async_test(int argc, char** argv)
184184
#endif
185185
do {
186186
#ifdef WOLFSSL_ASYNC_CRYPT
187-
if (err == WC_PENDING_E) {
187+
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
188188
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
189189
if (ret < 0)
190190
break;
191191
}
192192
#endif
193193
ret = wolfSSL_connect(ssl);
194194
err = wolfSSL_get_error(ssl, 0);
195-
} while (err == WC_PENDING_E);
195+
} while (err == WC_NO_ERR_TRACE(WC_PENDING_E));
196196
if (ret != WOLFSSL_SUCCESS) {
197197
fprintf(stderr, "wolfSSL_connect error %d: %s\n",
198198
err, wolfSSL_ERR_error_string(err, errBuff));
@@ -214,15 +214,15 @@ int client_async_test(int argc, char** argv)
214214
#endif
215215
do {
216216
#ifdef WOLFSSL_ASYNC_CRYPT
217-
if (err == WC_PENDING_E) {
217+
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
218218
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
219219
if (ret < 0)
220220
break;
221221
}
222222
#endif
223223
ret = wolfSSL_write(ssl, buff, (int)len);
224224
err = wolfSSL_get_error(ssl, 0);
225-
} while (err == WC_PENDING_E);
225+
} while (err == WC_NO_ERR_TRACE(WC_PENDING_E));
226226
if (ret != (int)len) {
227227
fprintf(stderr, "wolfSSL_write error %d: %s\n",
228228
err, wolfSSL_ERR_error_string(err, errBuff));
@@ -236,15 +236,15 @@ int client_async_test(int argc, char** argv)
236236
#endif
237237
do {
238238
#ifdef WOLFSSL_ASYNC_CRYPT
239-
if (err == WC_PENDING_E) {
239+
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
240240
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
241241
if (ret < 0)
242242
break;
243243
}
244244
#endif
245245
ret = wolfSSL_read(ssl, buff, sizeof(buff)-1);
246246
err = wolfSSL_get_error(ssl, 0);
247-
} while (err == WC_PENDING_E);
247+
} while (err == WC_NO_ERR_TRACE(WC_PENDING_E));
248248
if (ret < 0) {
249249
fprintf(stderr, "wolfSSL_read error %d: %s\n",
250250
err, wolfSSL_ERR_error_string(err, errBuff));

‎examples/async/async_server.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ int server_async_test(int argc, char** argv)
248248
#endif
249249
do {
250250
#ifdef WOLFSSL_ASYNC_CRYPT
251-
if (err == WC_PENDING_E) {
251+
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
252252
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
253253
if (ret < 0)
254254
break;
255255
}
256256
#endif
257257
ret = wolfSSL_accept(ssl);
258258
err = wolfSSL_get_error(ssl, 0);
259-
} while (err == WC_PENDING_E);
259+
} while (err == WC_NO_ERR_TRACE(WC_PENDING_E));
260260
if (ret != WOLFSSL_SUCCESS) {
261261
fprintf(stderr, "wolfSSL_accept error %d: %s\n",
262262
err, wolfSSL_ERR_error_string(err, errBuff));
@@ -273,15 +273,15 @@ int server_async_test(int argc, char** argv)
273273
#endif
274274
do {
275275
#ifdef WOLFSSL_ASYNC_CRYPT
276-
if (err == WC_PENDING_E) {
276+
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
277277
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
278278
if (ret < 0)
279279
break;
280280
}
281281
#endif
282282
ret = wolfSSL_read(ssl, buff, sizeof(buff)-1);
283283
err = wolfSSL_get_error(ssl, 0);
284-
} while (err == WC_PENDING_E);
284+
} while (err == WC_NO_ERR_TRACE(WC_PENDING_E));
285285
if (ret < 0) {
286286
fprintf(stderr, "wolfSSL_read error %d: %s\n",
287287
err, wolfSSL_ERR_error_string(err, errBuff));
@@ -308,15 +308,15 @@ int server_async_test(int argc, char** argv)
308308
#endif
309309
do {
310310
#ifdef WOLFSSL_ASYNC_CRYPT
311-
if (err == WC_PENDING_E) {
311+
if (err == WC_NO_ERR_TRACE(WC_PENDING_E)) {
312312
ret = wolfSSL_AsyncPoll(ssl, WOLF_POLL_FLAG_CHECK_HW);
313313
if (ret < 0)
314314
break;
315315
}
316316
#endif
317317
ret = wolfSSL_write(ssl, buff, (int)len);
318318
err = wolfSSL_get_error(ssl, 0);
319-
} while (err == WC_PENDING_E);
319+
} while (err == WC_NO_ERR_TRACE(WC_PENDING_E));
320320
if (ret != (int)len) {
321321
fprintf(stderr, "wolfSSL_write error %d: %s\n",
322322
err, wolfSSL_ERR_error_string(err, errBuff));

‎examples/async/async_tls.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
/* This is where you would plug-in calls to your own hardware crypto */
4646
int AsyncTlsCryptoCb(int devIdArg, wc_CryptoInfo* info, void* ctx)
4747
{
48-
int ret = CRYPTOCB_UNAVAILABLE; /* return this to bypass HW and use SW */
48+
int ret = WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE); /* bypass HW by default */
4949
AsyncTlsCryptoCbCtx* myCtx = (AsyncTlsCryptoCbCtx*)ctx;
5050

5151
if (info == NULL)

‎examples/benchmark/tls_bench.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,9 @@ static int SetupSupportedGroups(int verbose)
18161816
printf("Will benchmark the following group: %s\n",
18171817
groups[i].name);
18181818
}
1819-
} else if (uks_ret == BAD_FUNC_ARG || uks_ret == NOT_COMPILED_IN) {
1819+
} else if (uks_ret == WC_NO_ERR_TRACE(BAD_FUNC_ARG) ||
1820+
uks_ret == WC_NO_ERR_TRACE(NOT_COMPILED_IN))
1821+
{
18201822
groups[i].group = 0;
18211823
if (verbose) {
18221824
printf("Will NOT benchmark the following group: %s\n",

0 commit comments

Comments
 (0)