WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix mnGW error

pull/2750/head
Takashi Kojo 2019-11-16 07:30:20 +09:00 committed by John Safranek
parent a624ae14df
commit a08ab1fc7a
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IDE/WIN/user_settings.h
View File

@ -25,6 +25,7 @@
#else #else
/* Enables blinding mode, to prevent timing attacks */ /* Enables blinding mode, to prevent timing attacks */
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
#define NO_MULTIBYTE_PRINT
#if defined(WOLFSSL_LIB) #if defined(WOLFSSL_LIB)
/* The lib */ /* The lib */

26
examples/benchmark/tls_bench.c 100644 → 100755
View File

@ -447,18 +447,18 @@ static int SocketRecv(int sockFd, char* buf, int sz)
int recvd = (int)recv(sockFd, buf, sz, 0); int recvd = (int)recv(sockFd, buf, sz, 0);
if (recvd == -1) { if (recvd == -1) {
switch (errno) { switch (errno) {
#if EAGAIN != EWOULDBLOCK #if EAGAIN != SOCKET_EWOULDBLOCK
case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */ case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */
#endif #endif
case EWOULDBLOCK: case SOCKET_EWOULDBLOCK:
return WOLFSSL_CBIO_ERR_WANT_READ; return WOLFSSL_CBIO_ERR_WANT_READ;
case ECONNRESET: case SOCKET_ECONNRESET:
return WOLFSSL_CBIO_ERR_CONN_RST; return WOLFSSL_CBIO_ERR_CONN_RST;
case EINTR: case SOCKET_EINTR:
return WOLFSSL_CBIO_ERR_ISR; return WOLFSSL_CBIO_ERR_ISR;
case ECONNREFUSED: /* DTLS case */ case SOCKET_ECONNREFUSED: /* DTLS case */
return WOLFSSL_CBIO_ERR_WANT_READ; return WOLFSSL_CBIO_ERR_WANT_READ;
case ECONNABORTED: case SOCKET_ECONNABORTED:
return WOLFSSL_CBIO_ERR_CONN_CLOSE; return WOLFSSL_CBIO_ERR_CONN_CLOSE;
default: default:
return WOLFSSL_CBIO_ERR_GENERAL; 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); int sent = (int)send(sockFd, buf, sz, 0);
if (sent == -1) { if (sent == -1) {
switch (errno) { switch (errno) {
#if EAGAIN != EWOULDBLOCK #if EAGAIN != SOCKET_EWOULDBLOCK
case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */ case EAGAIN: /* EAGAIN == EWOULDBLOCK on some systems, but not others */
#endif #endif
case EWOULDBLOCK: case SOCKET_EWOULDBLOCK:
return WOLFSSL_CBIO_ERR_WANT_READ; return WOLFSSL_CBIO_ERR_WANT_READ;
case ECONNRESET: case SOCKET_ECONNRESET:
return WOLFSSL_CBIO_ERR_CONN_RST; return WOLFSSL_CBIO_ERR_CONN_RST;
case EINTR: case SOCKET_EINTR:
return WOLFSSL_CBIO_ERR_ISR; return WOLFSSL_CBIO_ERR_ISR;
case EPIPE: case SOCKET_EPIPE:
return WOLFSSL_CBIO_ERR_CONN_CLOSE; return WOLFSSL_CBIO_ERR_CONN_CLOSE;
default: default:
return WOLFSSL_CBIO_ERR_GENERAL; return WOLFSSL_CBIO_ERR_GENERAL;
@ -873,7 +873,7 @@ static void* client_thread(void* args)
static int SetupSocketAndListen(int* listenFd, word32 port) static int SetupSocketAndListen(int* listenFd, word32 port)
{ {
struct sockaddr_in servAddr; struct sockaddr_in servAddr;
int optval = 1; const char optval = 1;
/* Setup server address */ /* Setup server address */
XMEMSET(&servAddr, 0, sizeof(servAddr)); XMEMSET(&servAddr, 0, sizeof(servAddr));
@ -923,7 +923,7 @@ static int SocketWaitClient(info_t* info)
socklen_t size = sizeof(clientAddr); socklen_t size = sizeof(clientAddr);
if ((connd = accept(info->listenFd, (struct sockaddr*)&clientAddr, &size)) == -1) { if ((connd = accept(info->listenFd, (struct sockaddr*)&clientAddr, &size)) == -1) {
if (errno == EWOULDBLOCK) if (errno == SOCKET_EWOULDBLOCK)
return -2; return -2;
printf("ERROR: failed to accept the connection\n"); printf("ERROR: failed to accept the connection\n");
return -1; return -1;

4
wolfssl/wolfcrypt/types.h 100644 → 100755
View File

@ -500,7 +500,9 @@
} }
#define XSNPRINTF xsnprintf #define XSNPRINTF xsnprintf
#endif /* (_MSC_VER >= 1900) */ #endif /* (_MSC_VER >= 1900) */
#endif /* _MSC_VER || __CYGWIN__ || __MINGW32__ */ #else
#define XSNPRINTF snprintf
#endif /* _MSC_VER */
#endif /* USE_WINDOWS_API */ #endif /* USE_WINDOWS_API */
#if defined(WOLFSSL_CERT_EXT) || defined(OPENSSL_EXTRA) \ #if defined(WOLFSSL_CERT_EXT) || defined(OPENSSL_EXTRA) \