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

Check wolfSSL_BIO_read return

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2021-11-04 15:34:33 +01:00
parent 23487a4532
commit 1faa9e66b6
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@ -43750,7 +43750,10 @@ err:
if (headerEnd) {
headerEnd += XSTR_SIZEOF("-----");
/* Read in the newline */
(void)wolfSSL_BIO_read(bio, &pem[i], 1);
if (wolfSSL_BIO_read(bio, &pem[i], 1) != 1) {
WOLFSSL_MSG("wolfSSL_BIO_read error");
goto err;
}
i++;
if (*headerEnd != '\n' && *headerEnd != '\r') {
WOLFSSL_MSG("Missing newline after header");

24
tests/api.c
View File

@ -29683,10 +29683,23 @@ static void test_wolfSSL_X509_INFO(void)
X509_INFO *info;
BIO *cert;
int i;
/* PEM in hex format to avoid null terminator */
byte data[] = {
"---------BEGIN CERTc-----\n"
"MIIDMTBuQ=\n"
"-----END -----"
0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47,
0x49, 0x4e, 0x20, 0x43, 0x45, 0x52, 0x54, 0x63, 0x2d, 0x2d, 0x2d, 0x2d,
0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x44, 0x4d, 0x54, 0x42, 0x75, 0x51, 0x3d,
0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x2d, 0x2d,
0x2d, 0x2d, 0x2d
};
/* PEM in hex format to avoid null terminator */
byte data2[] = {
0x41, 0x53, 0x4e, 0x31, 0x20, 0x4f, 0x49, 0x44, 0x3a, 0x20, 0x70, 0x72,
0x69, 0x6d, 0x65, 0x32, 0x35, 0x36, 0x76, 0x31, 0x0a, 0x2d, 0x2d, 0x2d,
0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x45, 0x43, 0x20, 0x50,
0x41, 0x52, 0x41, 0x4d, 0x45, 0x54, 0x45, 0x52, 0x53, 0x2d, 0x2d, 0x2d,
0x2d, 0x43, 0x65, 0x72, 0x74, 0x69, 0x2d, 0x0a, 0x42, 0x67, 0x67, 0x71,
0x68, 0x6b, 0x6a, 0x4f, 0x50, 0x51, 0x4d, 0x42, 0x42, 0x77, 0x3d, 0x3d,
0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d
};
printf(testingFmt, "wolfSSL_X509_INFO");
@ -29712,6 +29725,11 @@ static void test_wolfSSL_X509_INFO(void)
AssertNull(info_stack = PEM_X509_INFO_read_bio(cert, NULL, NULL, NULL));
sk_X509_INFO_pop_free(info_stack, X509_INFO_free);
BIO_free(cert);
AssertNotNull(cert = BIO_new(BIO_s_mem()));
AssertIntEQ(BIO_write(cert, data2, sizeof(data2)), sizeof(data2));
AssertNull(info_stack = PEM_X509_INFO_read_bio(cert, NULL, NULL, NULL));
sk_X509_INFO_pop_free(info_stack, X509_INFO_free);
BIO_free(cert);
printf(resultFmt, passed);
#endif