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

websocketpp compat. addition, add new define for asio

Browse Source
This commit is contained in:
MJSPollard
2018-07-18 12:09:12 -06:00
parent db8939c578
commit 0dbd35ae01
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -3028,7 +3028,7 @@ then
ENABLED_OPENSSLALL="yes" ENABLED_OPENSSLALL="yes"
AM_CFLAGS="-DOPENSSL_ALL $AM_CFLAGS" AM_CFLAGS="-DOPENSSL_ALL $AM_CFLAGS"
fi fi
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ASIO -DWOLFSSL_KEY_GEN" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ASIO -DASIO_USE_WOLFSSL -DWOLFSSL_KEY_GEN"
AM_CFLAGS="$AM_CFLAGS -DSSL_TXT_TLSV1_2 -DSSL_TXT_TLSV1_1" AM_CFLAGS="$AM_CFLAGS -DSSL_TXT_TLSV1_2 -DSSL_TXT_TLSV1_1"
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3"
if test "$ENABLED_TLSV10" = "yes" if test "$ENABLED_TLSV10" = "yes"

2
src/wolfio.c
View File

@ -127,6 +127,7 @@ int BioReceive(WOLFSSL* ssl, char* buf, int sz, void* ctx)
switch (ssl->biord->type) { switch (ssl->biord->type) {
case WOLFSSL_BIO_MEMORY: case WOLFSSL_BIO_MEMORY:
case WOLFSSL_BIO_BIO:
if (wolfSSL_BIO_ctrl_pending(ssl->biord) == 0) { if (wolfSSL_BIO_ctrl_pending(ssl->biord) == 0) {
return WOLFSSL_CBIO_ERR_WANT_READ; return WOLFSSL_CBIO_ERR_WANT_READ;
} }
@ -167,6 +168,7 @@ int BioSend(WOLFSSL* ssl, char *buf, int sz, void *ctx)
switch (ssl->biowr->type) { switch (ssl->biowr->type) {
case WOLFSSL_BIO_MEMORY: case WOLFSSL_BIO_MEMORY:
case WOLFSSL_BIO_BIO:
sent = wolfSSL_BIO_write(ssl->biowr, buf, sz); sent = wolfSSL_BIO_write(ssl->biowr, buf, sz);
if (sent < 0) { if (sent < 0) {
return WOLFSSL_CBIO_ERR_GENERAL; return WOLFSSL_CBIO_ERR_GENERAL;