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

Refactor BIO read/write to use switch.

Browse Source
This commit is contained in:
David Garske
2021-03-24 10:20:16 -07:00
parent 072e6e010c
commit 8984ce03e9
2 changed files with 139 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/bio.c
View File

@@ -40,7 +40,7 @@ static int wolfSSL_BIO_BASE64_read(WOLFSSL_BIO* bio, void* buf, int len)
if (Base64_Decode((const byte*)buf, (word32)len, (byte*)buf, &frmtSz) !=0) { if (Base64_Decode((const byte*)buf, (word32)len, (byte*)buf, &frmtSz) !=0) {
WOLFSSL_MSG("Err doing base64 decode"); WOLFSSL_MSG("Err doing base64 decode");
return SSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
} }
(void)bio; (void)bio;
@@ -146,7 +146,7 @@ static int wolfSSL_BIO_SSL_read(WOLFSSL_BIO* bio, void* buf,
front->eof = 1; front->eof = 1;
else if (ret < 0) { else if (ret < 0) {
int err = wolfSSL_get_error((WOLFSSL*)bio->ptr, 0); int err = wolfSSL_get_error((WOLFSSL*)bio->ptr, 0);
if ( !(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) ) { if ( !(err == WOLFSSL_ERROR_WANT_READ || err == WOLFSSL_ERROR_WANT_WRITE) ) {
front->eof = 1; front->eof = 1;
} }
else { else {
@@ -214,46 +214,44 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
ret = bio->method->readCb(bio, (char*)buf, len); ret = bio->method->readCb(bio, (char*)buf, len);
} }
else { else {
/* formatting data */ switch (bio->type) {
if (bio->type == WOLFSSL_BIO_BASE64 && ret > 0 && sz > 0) { case WOLFSSL_BIO_BASE64: /* formatting data */
if (sz > 0)
ret = wolfSSL_BIO_BASE64_read(bio, buf, sz); ret = wolfSSL_BIO_BASE64_read(bio, buf, sz);
} break;
case WOLFSSL_BIO_BIO: /* read BIOs */
/* write BIOs */
if (bio && bio->type == WOLFSSL_BIO_BIO) {
ret = wolfSSL_BIO_BIO_read(bio, buf, len); ret = wolfSSL_BIO_BIO_read(bio, buf, len);
} break;
case WOLFSSL_BIO_MEMORY:
if (bio && bio->type == WOLFSSL_BIO_MEMORY) {
ret = wolfSSL_BIO_MEMORY_read(bio, buf, len); ret = wolfSSL_BIO_MEMORY_read(bio, buf, len);
} break;
case WOLFSSL_BIO_FILE:
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
if (bio && bio->type == WOLFSSL_BIO_FILE) { if (bio->ptr) {
if (bio->ptr)
ret = (int)XFREAD(buf, 1, len, (XFILE)bio->ptr); ret = (int)XFREAD(buf, 1, len, (XFILE)bio->ptr);
#if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR)\ }
&& !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2) #if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR) && \
else !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2)
else {
ret = (int)XREAD(bio->num, buf, len); ret = (int)XREAD(bio->num, buf, len);
#endif
} }
#endif #endif
#endif /* !NO_FILESYSTEM */
break;
case WOLFSSL_BIO_SSL:
#ifndef WOLFCRYPT_ONLY #ifndef WOLFCRYPT_ONLY
if (bio && bio->type == WOLFSSL_BIO_SSL) {
ret = wolfSSL_BIO_SSL_read(bio, buf, len, front); ret = wolfSSL_BIO_SSL_read(bio, buf, len, front);
}
/* data passing through BIO MD wrapper */
if (bio && bio->type == WOLFSSL_BIO_MD && ret > 0) {
ret = wolfSSL_BIO_MD_read(bio, buf, ret);
}
#endif #endif
break;
if (bio->type == WOLFSSL_BIO_SOCKET) { case WOLFSSL_BIO_MD: /* data passing through BIO MD wrapper */
#ifndef WOLFCRYPT_ONLY
ret = wolfSSL_BIO_MD_read(bio, buf, ret);
#endif
break;
case WOLFSSL_BIO_SOCKET:
ret = wolfIO_Recv(bio->num, (char*)buf, len, 0); ret = wolfIO_Recv(bio->num, (char*)buf, len, 0);
} break;
} /* switch */
} }
/* case where front of list is done */ /* case where front of list is done */
@@ -280,6 +278,7 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
} }
#ifdef WOLFSSL_BASE64_ENCODE
/* Converts data into base64 output /* Converts data into base64 output
* *
* returns the resulting buffer size on success. * returns the resulting buffer size on success.
@@ -296,7 +295,6 @@ static int wolfSSL_BIO_BASE64_write(WOLFSSL_BIO* bio, const void* data,
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#if defined(WOLFSSL_BASE64_ENCODE)
tmp = (byte*)XMALLOC(*outLen, bio->heap, DYNAMIC_TYPE_TMP_BUFFER); tmp = (byte*)XMALLOC(*outLen, bio->heap, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) { if (tmp == NULL) {
return WOLFSSL_FATAL_ERROR; return WOLFSSL_FATAL_ERROR;
@@ -322,18 +320,10 @@ static int wolfSSL_BIO_BASE64_write(WOLFSSL_BIO* bio, const void* data,
} }
XFREE(tmp, bio->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(tmp, bio->heap, DYNAMIC_TYPE_TMP_BUFFER);
#else
(void)bio;
(void)data;
(void)inLen;
(void)out;
(void)outLen;
(void)tmp;
WOLFSSL_MSG("BASE64 encoding not compiled in");
#endif
return ret; return ret;
} }
#endif /* WOLFSSL_BASE64_ENCODE */
#ifndef WOLFCRYPT_ONLY #ifndef WOLFCRYPT_ONLY
/* Helper function for writing to a WOLFSSL_BIO_SSL type /* Helper function for writing to a WOLFSSL_BIO_SSL type
@@ -357,7 +347,7 @@ static int wolfSSL_BIO_SSL_write(WOLFSSL_BIO* bio, const void* data,
front->eof = 1; front->eof = 1;
else if (ret < 0) { else if (ret < 0) {
int err = wolfSSL_get_error((WOLFSSL*)bio->ptr, 0); int err = wolfSSL_get_error((WOLFSSL*)bio->ptr, 0);
if ( !(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) ) { if ( !(err == WOLFSSL_ERROR_WANT_READ || err == WOLFSSL_ERROR_WANT_WRITE) ) {
front->eof = 1; front->eof = 1;
} }
else { else {
@@ -528,33 +518,36 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
if (bio->method && bio->method->writeCb) { if (bio->method && bio->method->writeCb) {
ret = bio->method->writeCb(bio, (const char*)data, len); ret = bio->method->writeCb(bio, (const char*)data, len);
} }
else {
/* check for formatting */ switch (bio->type) {
if (bio->type == WOLFSSL_BIO_BASE64) { case WOLFSSL_BIO_BASE64:
#if defined(WOLFSSL_BASE64_ENCODE) {
#ifdef WOLFSSL_BASE64_ENCODE
word32 sz = 0; word32 sz = 0;
/* get the encoded length */
if (bio->flags & WOLFSSL_BIO_FLAG_BASE64_NO_NL) { if (bio->flags & WOLFSSL_BIO_FLAG_BASE64_NO_NL) {
if (Base64_Encode_NoNl((const byte*)data, len, NULL, if (Base64_Encode_NoNl((const byte*)data, len, NULL,
&sz) != LENGTH_ONLY_E) { &sz) != LENGTH_ONLY_E) {
WOLFSSL_MSG("Error with base64 get length"); WOLFSSL_MSG("Error with base64 get length");
ret = SSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
} }
else { else {
if (Base64_Encode((const byte*)data, len, NULL, &sz) != if (Base64_Encode((const byte*)data, len, NULL, &sz) !=
LENGTH_ONLY_E) { LENGTH_ONLY_E) {
WOLFSSL_MSG("Error with base64 get length"); WOLFSSL_MSG("Error with base64 get length");
ret = SSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
} }
if (frmt == NULL && sz > 0 && ret != SSL_FATAL_ERROR) { /* allocate buffer for encoded output */
if (frmt == NULL && sz > 0 && ret != WOLFSSL_FATAL_ERROR) {
frmt = (void*)XMALLOC(sz, front->heap, frmt = (void*)XMALLOC(sz, front->heap,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (frmt == NULL) { if (frmt == NULL) {
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
ret = SSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
frmtSz = sz; frmtSz = sz;
} }
@@ -563,15 +556,14 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (frmt == NULL) { if (frmt == NULL) {
WOLFSSL_MSG("Memory error"); WOLFSSL_MSG("Memory error");
ret = SSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
/* since frmt already existed then data should point to knew /* since frmt already existed then data should point to
formatted buffer */ new formatted buffer */
data = frmt; data = frmt;
len = frmtSz; len = frmtSz;
frmtSz = sz; frmtSz = sz;
} }
#endif /* defined(WOLFSSL_BASE64_ENCODE) */
if (ret >= 0) { if (ret >= 0) {
/* change so that data is formatted buffer */ /* change so that data is formatted buffer */
@@ -580,57 +572,60 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
data = frmt; data = frmt;
len = frmtSz; len = frmtSz;
} }
#endif /* WOLFSSL_BASE64_ENCODE */
break;
} }
case WOLFSSL_BIO_BIO: /* write bios */
/* write bios */
if (bio->type == WOLFSSL_BIO_BIO) {
ret = wolfSSL_BIO_BIO_write(bio, data, len); ret = wolfSSL_BIO_BIO_write(bio, data, len);
} break;
case WOLFSSL_BIO_MEMORY:
if (bio->type == WOLFSSL_BIO_MEMORY) {
ret = wolfSSL_BIO_MEMORY_write(bio, data, len); ret = wolfSSL_BIO_MEMORY_write(bio, data, len);
} break;
case WOLFSSL_BIO_FILE:
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
if (bio && bio->type == WOLFSSL_BIO_FILE) { if (bio->ptr) {
if (bio->ptr)
ret = (int)XFWRITE(data, 1, len, (XFILE)bio->ptr); ret = (int)XFWRITE(data, 1, len, (XFILE)bio->ptr);
#if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR)\ }
&& !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2) #if !defined(USE_WINDOWS_API) && !defined(NO_WOLFSSL_DIR) && \
else !defined(WOLFSSL_NUCLEUS) && !defined(WOLFSSL_NUCLEUS_1_2)
else {
ret = (int)XWRITE(bio->num, data, len); ret = (int)XWRITE(bio->num, data, len);
#endif
} }
#endif #endif
#endif /* !NO_FILESYSTEM */
break;
case WOLFSSL_BIO_SSL:
#ifndef WOLFCRYPT_ONLY #ifndef WOLFCRYPT_ONLY
if (bio->type == WOLFSSL_BIO_SSL) {
/* already got eof, again is error */ /* already got eof, again is error */
if (front->eof) { if (front->eof) {
ret = SSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
} }
else { else {
ret = wolfSSL_BIO_SSL_write(bio, data, len, front); ret = wolfSSL_BIO_SSL_write(bio, data, len, front);
} }
/* Rest of chain is taken care of inside call */ /* Rest of chain is taken care of inside call */
goto exit_chain;
#endif
break; break;
} case WOLFSSL_BIO_MD:
#ifndef WOLFCRYPT_ONLY
if (bio->type == WOLFSSL_BIO_MD) {
if (bio->next != NULL) { /* data passing through MD BIO */ if (bio->next != NULL) { /* data passing through MD BIO */
ret = wolfSSL_BIO_MD_write(bio, data, len); ret = wolfSSL_BIO_MD_write(bio, data, len);
} }
} #endif
#endif /* WOLFCRYPT_ONLY */ break;
case WOLFSSL_BIO_SOCKET:
if (bio->type == WOLFSSL_BIO_SOCKET) {
ret = wolfIO_Send(bio->num, (char*)data, len, 0); ret = wolfIO_Send(bio->num, (char*)data, len, 0);
break;
} /* switch */
} }
/* advance to the next bio in list */ /* advance to the next bio in list */
bio = bio->next; bio = bio->next;
} }
exit_chain:
/* info cb, user can override return value */ /* info cb, user can override return value */
if (front != NULL && front->infoCb != NULL) { if (front != NULL && front->infoCb != NULL) {
ret = (int)front->infoCb(front, ret = (int)front->infoCb(front,