mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #402 from cconlon/starttls 

use send/recv instead of write/read with STARTTLS
This commit is contained in:
John Safranek 2016-05-02 17:19:50 -07:00
parent 52d6fb575b a94383037c
commit f9ab61db5d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/client/client.c
View File

@ -345,7 +345,7 @@ int StartTLS_Init(SOCKET_T* sockfd)
return BAD_FUNC_ARG;
/* S: 220 <host> SMTP service ready */
if (read(*sockfd, tmpBuf, sizeof(tmpBuf)) < 0)
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf), 0) < 0)
err_sys("failed to read STARTTLS command\n");
if (!XSTRNCMP(tmpBuf, starttlsCmd[0], XSTRLEN(starttlsCmd[0]))) {
@ -356,12 +356,12 @@ int StartTLS_Init(SOCKET_T* sockfd)
}
/* C: EHLO mail.example.com */
if (write(*sockfd, starttlsCmd[1], XSTRLEN(starttlsCmd[1])) !=
(int)XSTRLEN(starttlsCmd[1]))
if (send(*sockfd, starttlsCmd[1], (int)XSTRLEN(starttlsCmd[1]), 0) !=
(word32)XSTRLEN(starttlsCmd[1]))
err_sys("failed to send STARTTLS EHLO command\n");
/* S: 250 <host> offers a warm hug of welcome */
if (read(*sockfd, tmpBuf, sizeof(tmpBuf)) < 0)
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf), 0) < 0)
err_sys("failed to read STARTTLS command\n");
if (!XSTRNCMP(tmpBuf, starttlsCmd[2], XSTRLEN(starttlsCmd[2]))) {
@ -372,13 +372,13 @@ int StartTLS_Init(SOCKET_T* sockfd)
}
/* C: STARTTLS */
if (write(*sockfd, starttlsCmd[3], XSTRLEN(starttlsCmd[3])) !=
(int)XSTRLEN(starttlsCmd[3])) {
if (send(*sockfd, starttlsCmd[3], (int)XSTRLEN(starttlsCmd[3]), 0) !=
(word32)XSTRLEN(starttlsCmd[3])) {
err_sys("failed to send STARTTLS command\n");
}
/* S: 220 Go ahead */
if (read(*sockfd, tmpBuf, sizeof(tmpBuf)) < 0)
if (recv(*sockfd, tmpBuf, sizeof(tmpBuf), 0) < 0)
err_sys("failed to read STARTTLS command\n");
if (!XSTRNCMP(tmpBuf, starttlsCmd[4], XSTRLEN(starttlsCmd[4]))) {