feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for expected failure case on client write. Resolves test-fails.con server TLSv1.3 fail on no client certificate test.

Browse Source
This commit is contained in:
David Garske
2020-05-22 11:43:41 -07:00
parent d4fdd1e590
commit ad93813d75
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/client/client.c
View File

@@ -802,7 +802,8 @@ static int SMTP_Shutdown(WOLFSSL* ssl, int wc_shutdown)
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
static void ClientWrite(WOLFSSL* ssl, char* msg, int msgSz, const char* str) static int ClientWrite(WOLFSSL* ssl, char* msg, int msgSz, const char* str,
int exitWithRet)
{ {
int ret, err; int ret, err;
char buffer[WOLFSSL_MAX_ERROR_SZ]; char buffer[WOLFSSL_MAX_ERROR_SZ];
@@ -827,10 +828,14 @@ static void ClientWrite(WOLFSSL* ssl, char* msg, int msgSz, const char* str)
if (ret != msgSz) { if (ret != msgSz) {
printf("SSL_write%s msg error %d, %s\n", str, err, printf("SSL_write%s msg error %d, %s\n", str, err,
wolfSSL_ERR_error_string(err, buffer)); wolfSSL_ERR_error_string(err, buffer));
if (!exitWithRet) {
err_sys("SSL_write failed"); err_sys("SSL_write failed");
} }
} }
return err;
}
static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead, static int ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead,
const char* str, int exitWithRet) const char* str, int exitWithRet)
{ {
@@ -3102,7 +3107,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
wolfSSL_update_keys(ssl); wolfSSL_update_keys(ssl);
#endif #endif
ClientWrite(ssl, msg, msgSz, ""); err = ClientWrite(ssl, msg, msgSz, "", exitWithRet);
if (exitWithRet && (err != 0)) {
((func_args*)args)->return_code = err;
goto exit;
}
err = ClientRead(ssl, reply, sizeof(reply)-1, 1, "", exitWithRet); err = ClientRead(ssl, reply, sizeof(reply)-1, 1, "", exitWithRet);
if (exitWithRet && (err != 0)) { if (exitWithRet && (err != 0)) {
@@ -3112,7 +3121,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#if defined(WOLFSSL_TLS13) #if defined(WOLFSSL_TLS13)
if (updateKeysIVs || postHandAuth) if (updateKeysIVs || postHandAuth)
ClientWrite(ssl, msg, msgSz, ""); (void)ClientWrite(ssl, msg, msgSz, "", 0);
#endif #endif
if (sendGET) { /* get html */ if (sendGET) { /* get html */
(void)ClientRead(ssl, reply, sizeof(reply)-1, 0, "", 0); (void)ClientRead(ssl, reply, sizeof(reply)-1, 0, "", 0);
@@ -3364,12 +3373,12 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
} }
#endif /* HAVE_SECURE_RENEGOTIATION */ #endif /* HAVE_SECURE_RENEGOTIATION */
ClientWrite(sslResume, resumeMsg, resumeSz, " resume"); (void)ClientWrite(sslResume, resumeMsg, resumeSz, " resume", 0);
(void)ClientRead(sslResume, reply, sizeof(reply)-1, sendGET, (void)ClientRead(sslResume, reply, sizeof(reply)-1, sendGET,
"Server resume: ", 0); "Server resume: ", 0);
/* try to send session break */ /* try to send session break */
ClientWrite(sslResume, msg, msgSz, " resume 2"); (void)ClientWrite(sslResume, msg, msgSz, " resume 2", 0);
ret = wolfSSL_shutdown(sslResume); ret = wolfSSL_shutdown(sslResume);
if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE) if (wc_shutdown && ret == WOLFSSL_SHUTDOWN_NOT_DONE)