Skip to content

Commit 94c915c

Browse files
committed
Revert all temporary tests
1 parent 4482a89 commit 94c915c

File tree

4 files changed

+1
-58
lines changed

4 files changed

+1
-58
lines changed

.github/workflows/os-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Build and test wolfSSL
7171
uses: wolfSSL/actions-build-autotools-project@v1
7272
with:
73-
configure: CFLAGS="-pedantic -Wno-overlength-strings -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE" ${{ matrix.config }} --enable-debug
73+
configure: CFLAGS="-pedantic -Wno-overlength-strings -Wdeclaration-after-statement -DTEST_LIBWOLFSSL_SOURCES_INCLUSION_SEQUENCE" ${{ matrix.config }}
7474
check: true
7575

7676
make_user_settings:

tests/api.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8044,8 +8044,6 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
80448044
tcp_accept(
80458045
&sockfd, &clientfd, opts, port, 0, doUdp, 0, 0, 1, 0, 0);
80468046

8047-
printf("test_server_nofail: after tcp_accept\n");
8048-
80498047
if (doUdp) {
80508048
cliLen = sizeof(cliAddr);
80518049

@@ -8085,8 +8083,6 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
80858083
goto done;
80868084
}
80878085

8088-
printf("test_server_nofail: after use certificate file\n");
8089-
80908086
if (cbf != NULL && cbf->keyPemFile != NULL)
80918087
keyFile = cbf->keyPemFile;
80928088
#if defined(OPENSSL_EXTRA) || defined(WOLFSSL_EITHER_SIDE)
@@ -8101,8 +8097,6 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
81018097
goto done;
81028098
}
81038099

8104-
printf("test_server_nofail: after use private key file\n");
8105-
81068100
#ifdef HAVE_CRL
81078101
if (cbf != NULL && cbf->crlPemFile != NULL) {
81088102
if (wolfSSL_CTX_EnableCRL(ctx, WOLFSSL_CRL_CHECKALL) != WOLFSSL_SUCCESS)
@@ -8119,14 +8113,12 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
81198113
}
81208114

81218115
ssl = wolfSSL_new(ctx);
8122-
printf("test_server_nofail: after wolfSSL_new. ssl = %p\n", (void*)ssl);
81238116
if (ssl == NULL) {
81248117
goto done;
81258118
}
81268119

81278120
if (doUdp) {
81288121
err = wolfSSL_dtls_set_peer(ssl, &cliAddr, cliLen);
8129-
printf("test_server_nofail: after wolfSSL_dtls_set_peer. err = %d\n", err);
81308122
if (err != WOLFSSL_SUCCESS)
81318123
goto done;
81328124
}
@@ -8166,7 +8158,6 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
81668158
/*err_sys("SSL_set_fd failed");*/
81678159
goto done;
81688160
}
8169-
printf("test_server_nofail: after wolfSSL_set_fd\n");
81708161

81718162
#if !defined(NO_FILESYSTEM) && !defined(NO_DH)
81728163
wolfSSL_SetTmpDH_file(ssl, dhParamFile, WOLFSSL_FILETYPE_PEM);
@@ -8199,12 +8190,9 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
81998190
char buff[WOLFSSL_MAX_ERROR_SZ];
82008191
fprintf(stderr, "error = %d, %s\n", err,
82018192
wolfSSL_ERR_error_string((word32)err, buff));
8202-
fprintf(stdout, "wolfSSL_negotiate error = %d, %s\n", err,
8203-
wolfSSL_ERR_error_string((word32)err, buff));
82048193
/*err_sys("SSL_accept failed");*/
82058194
goto done;
82068195
}
8207-
printf("test_server_nofail: after wolfSSL_negotiate. ret = %d\n", ret);
82088196

82098197
#ifdef WOLFSSL_HAVE_TLS_UNIQUE
82108198
XMEMSET(server_side_msg2, 0, WC_MAX_DIGEST_SIZE);
@@ -8217,7 +8205,6 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
82178205
#endif /* WOLFSSL_HAVE_TLS_UNIQUE */
82188206

82198207
idx = wolfSSL_read(ssl, input, sizeof(input)-1);
8220-
printf("test_server_nofail: after wolfSSL_read. idx = %d\n", idx);
82218208
if (idx > 0) {
82228209
input[idx] = '\0';
82238210
fprintf(stderr, "Client message: %s\n", input);
@@ -8227,11 +8214,9 @@ THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
82278214
}
82288215

82298216
if (wolfSSL_write(ssl, msg, sizeof(msg)) != sizeof(msg)) {
8230-
printf("test_server_nofail: wolfSSL_write error\n");
82318217
/*err_sys("SSL_write failed");*/
82328218
goto done;
82338219
}
8234-
printf("test_server_nofail: after wolfSSL_write\n");
82358220

82368221
if (cbf != NULL && cbf->on_result != NULL)
82378222
cbf->on_result(ssl);

tests/api/test_tls_ext.c

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,10 @@ static int certificate_authorities_client_cb(WOLFSSL *ssl, void *_arg) {
146146
arg->names1 = wolfSSL_get_client_CA_list(ssl);
147147
arg->names2 = wolfSSL_get0_peer_CA_list(ssl);
148148

149-
printf("(client cb)\n");
150-
fflush(stdout);
151-
152149
if (!wolfSSL_use_certificate_file(ssl, cliCertFile, SSL_FILETYPE_PEM))
153150
return 0;
154151
if (!wolfSSL_use_PrivateKey_file(ssl, cliKeyFile, SSL_FILETYPE_PEM))
155152
return 0;
156-
157-
printf("(client cb) arg->names1 = %p\n", (void*)arg->names1);
158-
printf("(client cb) arg->names2 = %p\n", (void*)arg->names2);
159-
fflush(stdout);
160153
return 1;
161154
}
162155
#endif
@@ -202,35 +195,6 @@ int test_certificate_authorities_certificate_request(void) {
202195
if (EXPECT_FAIL())
203196
break;
204197

205-
#ifdef WOLFSSL_TLS13
206-
if (params[i].client_meth == wolfTLSv1_3_client_method) {
207-
printf("TLS 1.3\n");
208-
}
209-
else
210-
#endif
211-
#if !defined(WOLFSSL_NO_TLS12) && (defined(OPENSSL_ALL) || \
212-
defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY))
213-
if (params[i].client_meth == wolfTLSv1_2_client_method) {
214-
printf("TLS 1.2\n");
215-
}
216-
else
217-
#endif
218-
#ifdef WOLFSSL_DTLS13
219-
if (params[i].client_meth == wolfDTLSv1_3_client_method) {
220-
printf("DTLS 1.3\n");
221-
}
222-
else
223-
#endif
224-
#if defined(WOLFSSL_DTLS) && (defined(OPENSSL_ALL) || \
225-
defined(WOLFSSL_NGINX) || defined(HAVE_LIGHTY))
226-
if (params[i].client_meth == wolfDTLSv1_2_client_method) {
227-
printf("DTLS 1.2\n");
228-
}
229-
else
230-
#endif
231-
{}
232-
fflush(stdout);
233-
234198
ExpectNotNull(ctx = wolfSSL_CTX_new(params[i].server_meth()));
235199

236200
names1 = wolfSSL_load_client_CA_file(cliCertFile);
@@ -368,14 +332,10 @@ static int certificate_authorities_server_cb(WOLFSSL *ssl, void *_arg) {
368332
int *names_num = (int *)_arg;
369333
WOLF_STACK_OF(X509_NAME) *names = wolfSSL_get0_peer_CA_list(ssl);
370334
*names_num = wolfSSL_sk_X509_NAME_num(names);
371-
printf("(server cb)\n");
372-
fflush(stdout);
373335
if (!wolfSSL_use_certificate_file(ssl, svrCertFile, SSL_FILETYPE_PEM))
374336
return 0;
375337
if (!wolfSSL_use_PrivateKey_file(ssl, svrKeyFile, SSL_FILETYPE_PEM))
376338
return 0;
377-
printf("(server cb) names_num = %p %d\n", (void*)names_num, *names_num);
378-
fflush(stdout);
379339
return 1;
380340
}
381341
#endif

wolfssl/test.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,8 +1729,6 @@ static WC_INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
17291729
if(do_listen) {
17301730
tcp_listen(sockfd, &port, useAnyAddr, udp, sctp);
17311731

1732-
printf("tcp_accept: after udp_accept & tcp_listen\n");
1733-
17341732
#ifndef SINGLE_THREADED
17351733
/* signal ready to tcp_accept */
17361734
if (args)

0 commit comments

Comments
 (0)