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

Updates for nginx 1.10.3

Browse Source 
Don't return global error when: SOCKET_PEER_CLOSED_E or SOCKET_ERROR_E
Increase max ex_data items to 5
This commit is contained in:
Sean Parkinson
2017-03-03 16:38:29 +10:00
parent 13e6217fd5
commit 0182d99efb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ssl.c
View File

@ -23004,7 +23004,8 @@ unsigned long wolfSSL_ERR_peek_error_line_data(const char **file, int *line,
if (ret == SSL_NO_PEM_HEADER) if (ret == SSL_NO_PEM_HEADER)
return (ERR_LIB_PEM << 24) | PEM_R_NO_START_LINE; return (ERR_LIB_PEM << 24) | PEM_R_NO_START_LINE;
if (ret != WANT_READ && ret != WANT_WRITE && if (ret != WANT_READ && ret != WANT_WRITE &&
ret != ZERO_RETURN && ret != SSL_ERROR_ZERO_RETURN) ret != ZERO_RETURN && ret != SSL_ERROR_ZERO_RETURN &&
ret != SOCKET_PEER_CLOSED_E && ret != SOCKET_ERROR_E)
break; break;
wc_RemoveErrorNode(-1); wc_RemoveErrorNode(-1);

2
wolfssl/internal.h
View File

@ -1059,7 +1059,7 @@ enum Misc {
MAX_WOLFSSL_FILE_SIZE = 1024 * 1024 * 4, /* 4 mb file size alloc limit */ MAX_WOLFSSL_FILE_SIZE = 1024 * 1024 * 4, /* 4 mb file size alloc limit */
#if defined(HAVE_EX_DATA) || defined(FORTRESS) #if defined(HAVE_EX_DATA) || defined(FORTRESS)
MAX_EX_DATA = 4, /* allow for four items of ex_data */ MAX_EX_DATA = 5, /* allow for five items of ex_data */
#endif #endif
MAX_X509_SIZE = 2048, /* max static x509 buffer size */ MAX_X509_SIZE = 2048, /* max static x509 buffer size */