wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing with WOLFSSL_BIO write

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-03-28 09:35:52 -06:00
parent cda44c89ac
commit b5ab505d1e
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bio.c
View File

@@ -328,30 +328,41 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
while (bio != NULL && ret >= 0) { while (bio != NULL && ret >= 0) {
/* check for formating */ /* check for formating */
if (bio && bio->type == WOLFSSL_BIO_BASE64) { if (bio && bio->type == WOLFSSL_BIO_BASE64) {
#if defined(WOLFSSL_BASE64_ENCODE) #if defined(WOLFSSL_BASE64_ENCODE)
word32 sz = 0;
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,
&frmtSz) != LENGTH_ONLY_E) { &sz) != LENGTH_ONLY_E) {
WOLFSSL_MSG("Error with base 64 get length"); WOLFSSL_MSG("Error with base 64 get length");
ret = SSL_FATAL_ERROR; ret = SSL_FATAL_ERROR;
} }
} }
else { else {
if (Base64_Encode((const byte*)data, len, NULL, &frmtSz) != if (Base64_Encode((const byte*)data, len, NULL, &sz) !=
LENGTH_ONLY_E) { LENGTH_ONLY_E) {
WOLFSSL_MSG("Error with base 64 get length"); WOLFSSL_MSG("Error with base 64 get length");
ret = SSL_FATAL_ERROR; ret = SSL_FATAL_ERROR;
} }
} }
if (frmt == NULL && frmtSz > 0 && ret != SSL_FATAL_ERROR) { if (frmt == NULL && sz > 0 && ret != SSL_FATAL_ERROR) {
frmt = (void*)XMALLOC(frmtSz, bio->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 = SSL_FATAL_ERROR;
} }
frmtSz = sz;
}
else if (sz > frmtSz) {
frmt = (void*)XREALLOC(frmt, sz, front->heap,
DYNAMIC_TYPE_TMP_BUFFER);
if (frmt == NULL) {
WOLFSSL_MSG("Memory error");
ret = SSL_FATAL_ERROR;
}
frmtSz = sz;
} }
#endif /* defined(WOLFSSL_BASE64_ENCODE) */ #endif /* defined(WOLFSSL_BASE64_ENCODE) */
@@ -394,7 +405,7 @@ int wolfSSL_BIO_write(WOLFSSL_BIO* bio, const void* data, int len)
} }
if (frmt != NULL) { if (frmt != NULL) {
XFREE(frmt, bio->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(frmt, front->heap, DYNAMIC_TYPE_TMP_BUFFER);
} }
return ret; return ret;

15
tests/api.c
View File

@@ -15579,6 +15579,21 @@ static void test_wolfSSL_BIO_write(void)
AssertIntEQ(XMEMCMP(out, expected, sz), 0); AssertIntEQ(XMEMCMP(out, expected, sz), 0);
BIO_free_all(bio); /* frees bio64 also */ BIO_free_all(bio); /* frees bio64 also */
/* test with more than one bio64 in list */
AssertNotNull(bio64 = BIO_new(BIO_f_base64()));
AssertNotNull(bio = BIO_push(bio64, BIO_new(BIO_f_base64())));
AssertNotNull(bio = BIO_push(bio, BIO_new(BIO_s_mem())));
/* now should convert to base64(x2) when stored and then decode with read */
AssertIntEQ(BIO_write(bio, msg, sizeof(msg)), 25);
BIO_flush(bio);
sz = sizeof(out);
XMEMSET(out, 0, sz);
AssertIntEQ((sz = BIO_read(bio, out, sz)), 16);
AssertIntEQ(XMEMCMP(out, msg, sz), 0);
BIO_free_all(bio); /* frees bio64s also */
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif
} }