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

Refactor wolfSSL_BIO_BASE64_write to simplify its logic

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2021-04-08 19:11:55 +02:00
parent f298bb9f22
commit beff4daf7e
1 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/bio.c
View File

@ -298,11 +298,12 @@ int wolfSSL_BIO_read(WOLFSSL_BIO* bio, void* buf, int len)
/** /**
* `out` buffer is allocated here and the caller is responsible * `out` buffer is allocated here and the caller is responsible
* for free'ing it * for free'ing it
* `data` and `out` can be the same in which case `data` should
* always be set to `out` after this function call succeeds
*/ */
static int wolfSSL_BIO_BASE64_write(WOLFSSL_BIO* bio, const void* data, static int wolfSSL_BIO_BASE64_write(WOLFSSL_BIO* bio, const void* data,
word32 inLen, byte** out, word32* outLen, void* heap) word32 inLen, byte** out, word32* outLen, void* heap)
{ {
int ret = WOLFSSL_FATAL_ERROR;
byte* tmp = NULL; byte* tmp = NULL;
word32 sz = 0; word32 sz = 0;
@ -333,59 +334,38 @@ static int wolfSSL_BIO_BASE64_write(WOLFSSL_BIO* bio, const void* data,
return 0; /* nothing to do */ return 0; /* nothing to do */
} }
/* allocate buffer for encoded output */ /* allocate temp buffer, since base64 encode does not allow inline */
if (*out == NULL) { tmp = (byte*)XMALLOC(sz, heap, DYNAMIC_TYPE_TMP_BUFFER);
*out = (byte*)XMALLOC(sz, heap, DYNAMIC_TYPE_TMP_BUFFER); if (tmp == NULL) {
if (*out == NULL) { WOLFSSL_MSG("Memory error");
WOLFSSL_MSG("Memory error"); return WOLFSSL_FATAL_ERROR;
return WOLFSSL_FATAL_ERROR;
}
tmp = *out;
} }
else {
if (sz > *outLen) {
/* use existing buffer as input */
tmp = (byte*)XREALLOC(*out, sz, heap, DYNAMIC_TYPE_TMP_BUFFER);
if (tmp == NULL) {
/* out is free'd by caller */
WOLFSSL_MSG("Realloc memory error");
return WOLFSSL_FATAL_ERROR;
}
*out = tmp;
}
data = *out;
inLen = *outLen;
/* allocate temp buffer, since base64 encode does not allow inline */
tmp = (byte*)XMALLOC(sz, heap, DYNAMIC_TYPE_TMP_BUFFER);
}
ret = inLen; /* For successful encode return inLen */
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, inLen, if (Base64_Encode_NoNl((const byte*)data, inLen,
tmp, &sz) < 0) { tmp, &sz) < 0) {
ret = WOLFSSL_FATAL_ERROR; WOLFSSL_MSG("Base64_Encode_NoNl error");
XFREE(tmp, heap, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFSSL_FATAL_ERROR;
} }
} }
else { else {
if (Base64_Encode((const byte*)data, inLen, if (Base64_Encode((const byte*)data, inLen,
tmp, &sz) < 0) { tmp, &sz) < 0) {
ret = WOLFSSL_FATAL_ERROR; WOLFSSL_MSG("Base64_Encode error");
XFREE(tmp, heap, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFSSL_FATAL_ERROR;
} }
} }
if (ret >= 0) {
*outLen = sz;
}
/* if temp used, copy and free */ if (*out != NULL)
if (tmp != *out) { XFREE(*out, heap, DYNAMIC_TYPE_TMP_BUFFER);
XMEMCPY(*out, tmp, *outLen); *out = tmp;
XFREE(tmp, heap, DYNAMIC_TYPE_TMP_BUFFER); *outLen = sz;
}
/* out is free'd by caller */ /* out is free'd by caller */
(void)heap; (void)heap;
return ret; return inLen;
} }
#endif /* WOLFSSL_BASE64_ENCODE */ #endif /* WOLFSSL_BASE64_ENCODE */