mirror of https://github.com/wolfSSL/wolfssl.git
fix mnGW error
parent
a624ae14df
commit
a08ab1fc7a
|
@ -25,6 +25,7 @@
|
|||
#else
|
||||
/* Enables blinding mode, to prevent timing attacks */
|
||||
#define WC_RSA_BLINDING
|
||||
#define NO_MULTIBYTE_PRINT
|
||||
|
||||
#if defined(WOLFSSL_LIB)
|
||||
/* The lib */
|
||||
|
|
|
@ -447,18 +447,18 @@ static int SocketRecv(int sockFd, char* buf, int sz)
|
|||
int recvd = (int)recv(sockFd, buf, sz, 0);
|
||||
if (recvd == -1) {
|
||||
switch (errno) {
|
||||
#if EAGAIN != EWOULDBLOCK
|
||||
#if EAGAIN != SOCKET_EWOULDBLOCK
|
||||
case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */
|
||||
#endif
|
||||
case EWOULDBLOCK:
|
||||
case SOCKET_EWOULDBLOCK:
|
||||
return WOLFSSL_CBIO_ERR_WANT_READ;
|
||||
case ECONNRESET:
|
||||
case SOCKET_ECONNRESET:
|
||||
return WOLFSSL_CBIO_ERR_CONN_RST;
|
||||
case EINTR:
|
||||
case SOCKET_EINTR:
|
||||
return WOLFSSL_CBIO_ERR_ISR;
|
||||
case ECONNREFUSED: /* DTLS case */
|
||||
case SOCKET_ECONNREFUSED: /* DTLS case */
|
||||
return WOLFSSL_CBIO_ERR_WANT_READ;
|
||||
case ECONNABORTED:
|
||||
case SOCKET_ECONNABORTED:
|
||||
return WOLFSSL_CBIO_ERR_CONN_CLOSE;
|
||||
default:
|
||||
return WOLFSSL_CBIO_ERR_GENERAL;
|
||||
|
@ -475,16 +475,16 @@ static int SocketSend(int sockFd, char* buf, int sz)
|
|||
int sent = (int)send(sockFd, buf, sz, 0);
|
||||
if (sent == -1) {
|
||||
switch (errno) {
|
||||
#if EAGAIN != EWOULDBLOCK
|
||||
#if EAGAIN != SOCKET_EWOULDBLOCK
|
||||
case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */
|
||||
#endif
|
||||
case EWOULDBLOCK:
|
||||
case SOCKET_EWOULDBLOCK:
|
||||
return WOLFSSL_CBIO_ERR_WANT_READ;
|
||||
case ECONNRESET:
|
||||
case SOCKET_ECONNRESET:
|
||||
return WOLFSSL_CBIO_ERR_CONN_RST;
|
||||
case EINTR:
|
||||
case SOCKET_EINTR:
|
||||
return WOLFSSL_CBIO_ERR_ISR;
|
||||
case EPIPE:
|
||||
case SOCKET_EPIPE:
|
||||
return WOLFSSL_CBIO_ERR_CONN_CLOSE;
|
||||
default:
|
||||
return WOLFSSL_CBIO_ERR_GENERAL;
|
||||
|
@ -873,7 +873,7 @@ static void* client_thread(void* args)
|
|||
static int SetupSocketAndListen(int* listenFd, word32 port)
|
||||
{
|
||||
struct sockaddr_in servAddr;
|
||||
int optval = 1;
|
||||
const char optval = 1;
|
||||
|
||||
/* Setup server address */
|
||||
XMEMSET(&servAddr, 0, sizeof(servAddr));
|
||||
|
@ -923,7 +923,7 @@ static int SocketWaitClient(info_t* info)
|
|||
socklen_t size = sizeof(clientAddr);
|
||||
|
||||
if ((connd = accept(info->listenFd, (struct sockaddr*)&clientAddr, &size)) == -1) {
|
||||
if (errno == EWOULDBLOCK)
|
||||
if (errno == SOCKET_EWOULDBLOCK)
|
||||
return -2;
|
||||
printf("ERROR: failed to accept the connection\n");
|
||||
return -1;
|
||||
|
|
|
@ -500,7 +500,9 @@
|
|||
}
|
||||
#define XSNPRINTF xsnprintf
|
||||
#endif /* (_MSC_VER >= 1900) */
|
||||
#endif /* _MSC_VER || __CYGWIN__ || __MINGW32__ */
|
||||
#else
|
||||
#define XSNPRINTF snprintf
|
||||
#endif /* _MSC_VER */
|
||||
#endif /* USE_WINDOWS_API */
|
||||
|
||||
#if defined(WOLFSSL_CERT_EXT) || defined(OPENSSL_EXTRA) \
|
||||
|
|
Loading…
Reference in New Issue