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

Fix StartTLS_Init (#5907)

Browse Source 
* Fix StartTLS_Init (contribution by Yota Nagaya)
This commit is contained in:
youtai
2023-01-04 02:28:23 +09:00
committed by GitHub
parent c925223822
commit 4edae51095
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/client/client.c
View File

@ -843,7 +843,8 @@ static int StartTLS_Init(SOCKET_T* sockfd)
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0) if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
err_sys("failed to read STARTTLS command\n"); err_sys("failed to read STARTTLS command\n");
if (!XSTRCMP(tmpBuf, starttlsCmd[0])) { if ((!XSTRNCMP(tmpBuf, starttlsCmd[0], XSTRLEN(starttlsCmd[0]))) &&
(tmpBuf[XSTRLEN(starttlsCmd[0])] == ' ')) {
printf("%s\n", tmpBuf); printf("%s\n", tmpBuf);
} else { } else {
err_sys("incorrect STARTTLS command received"); err_sys("incorrect STARTTLS command received");
@ -859,7 +860,8 @@ static int StartTLS_Init(SOCKET_T* sockfd)
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0) if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
err_sys("failed to read STARTTLS command\n"); err_sys("failed to read STARTTLS command\n");
if (!XSTRCMP(tmpBuf, starttlsCmd[2])) { if ((!XSTRNCMP(tmpBuf, starttlsCmd[2], XSTRLEN(starttlsCmd[2]))) &&
(tmpBuf[XSTRLEN(starttlsCmd[2])] == '-')) {
printf("%s\n", tmpBuf); printf("%s\n", tmpBuf);
} else { } else {
err_sys("incorrect STARTTLS command received"); err_sys("incorrect STARTTLS command received");
@ -876,7 +878,9 @@ static int StartTLS_Init(SOCKET_T* sockfd)
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0) if (recv(*sockfd, tmpBuf, sizeof(tmpBuf)-1, 0) < 0)
err_sys("failed to read STARTTLS command\n"); err_sys("failed to read STARTTLS command\n");
tmpBuf[sizeof(tmpBuf)-1] = '\0'; tmpBuf[sizeof(tmpBuf)-1] = '\0';
if (!XSTRCMP(tmpBuf, starttlsCmd[4])) {
if ((!XSTRNCMP(tmpBuf, starttlsCmd[4], XSTRLEN(starttlsCmd[4]))) &&
(tmpBuf[XSTRLEN(starttlsCmd[4])] == ' ')) {
printf("%s\n", tmpBuf); printf("%s\n", tmpBuf);
} else { } else {
err_sys("incorrect STARTTLS command received, expected 220"); err_sys("incorrect STARTTLS command received, expected 220");