Merge pull request #1135 from dgarske/cy

Fix issue with empty array (requires C99 compliance).
This commit is contained in:
toddouska
2017-09-13 14:39:50 -07:00
committed by GitHub
3 changed files with 7 additions and 6 deletions

View File

@ -572,9 +572,8 @@ int wolfIO_Recv(SOCKET_T sd, char *buf, int sz, int rdFlags)
int wolfIO_Send(SOCKET_T sd, char *buf, int sz, int wrFlags)
{
int sent;
int len = sz;
sent = (int)SEND_FUNCTION(sd, &buf[sz - len], len, wrFlags);
sent = (int)SEND_FUNCTION(sd, buf, sz, wrFlags);
sent = TranslateReturnCode(sent, sd);
return sent;

View File

@ -10279,12 +10279,16 @@ static void test_wc_ecc_get_curve_id_from_params(void)
return -1;
}
#ifndef NO_FILESYSTEM
ret = wolfSSL_CertManagerLoadCA(cm, ca, 0);
if (ret != SSL_SUCCESS) {
printf("wolfSSL_CertManagerLoadCA failed\n");
wolfSSL_CertManagerFree(cm);
return ret;
}
#else
(void)ca;
#endif
ret = wolfSSL_CertManagerVerifyBuffer(cm, cert_buf, cert_sz, SSL_FILETYPE_ASN1);
/* Let AssertIntEQ handle return code */

View File

@ -3499,8 +3499,6 @@ int poly1305_test(void)
byte tag[16];
Poly1305 enc;
static const byte empty[] = { };
static const byte msg1[] =
{
0x43,0x72,0x79,0x70,0x74,0x6f,0x67,0x72,
@ -3619,8 +3617,8 @@ int poly1305_test(void)
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
const byte* msgs[] = {empty, msg1, msg2, msg3, msg5};
word32 szm[] = {sizeof(empty), sizeof(msg1), sizeof(msg2),
const byte* msgs[] = {NULL, msg1, msg2, msg3, msg5};
word32 szm[] = {0, sizeof(msg1), sizeof(msg2),
sizeof(msg3), sizeof(msg5)};
const byte* keys[] = {key, key, key2, key2, key5};
const byte* tests[] = {correct0, correct1, correct2, correct3, correct5};