Merge pull request #141 from dgarske/fix_nightly2

Fixes for nightly Jenkins reports (pass 2).
pull/149/head
Kaleb Himes 2019-04-30 13:06:31 -06:00 committed by GitHub
commit 794587b45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions

View File

@ -283,7 +283,7 @@ int main(int argc, char** argv)
{
Des3 des3;
byte* key; /* user entered key */
FILE* inFile;
FILE* inFile = NULL;
FILE* outFile = NULL;
const char* in;

View File

@ -279,7 +279,7 @@ int main(int argc, char** argv)
{
Camellia cam;
byte* key; /* user entered key */
FILE* inFile;
FILE* inFile = NULL;
FILE* outFile = NULL;
const char* in;

View File

@ -326,6 +326,7 @@ int main(int argc, char** argv)
/* echo until shutdown received */
while (cleanup == 0 && ret == 0) {
buffLen = 0;
ret = wolfSSL_read(ssl, buff, sizeof(buff)-1);
if (ret > 0) {
printf("heard %d bytes\n", ret);

View File

@ -86,7 +86,7 @@ int main(int argc, char** argv)
/* NonBlockingSSL_Accept variables */
int ret;
int select_ret;
int currTimeout;
int currTimeout = 0;
int error;
int result;
int nfds;
@ -123,7 +123,7 @@ int main(int argc, char** argv)
return 1;
}
/* Load server certificates */
if (wolfSSL_CTX_use_certificate_file(ctx, servCertLoc, SSL_FILETYPE_PEM) !=
if (wolfSSL_CTX_use_certificate_file(ctx, servCertLoc, SSL_FILETYPE_PEM) !=
SSL_SUCCESS) {
printf("Error loading %s, please check the file.\n", servCertLoc);
return 1;
@ -188,6 +188,7 @@ int main(int argc, char** argv)
printf("Awaiting client connection on port %d\n", SERV_PORT);
/* UDP-read-connect */
bytesRecvd = 0;
do {
if (cleanup == 1) {
cont = 1;
@ -256,6 +257,7 @@ int main(int argc, char** argv)
result = select(nfds, &recvfds, NULL, &errfds, &timeout);
select_ret = TEST_SELECT_FAIL;
if (result == 0) {
select_ret = TEST_TIMEOUT;
}
@ -267,9 +269,6 @@ int main(int argc, char** argv)
select_ret = TEST_ERROR_READY;
}
}
else {
select_ret = TEST_SELECT_FAIL;
}
if ((select_ret == TEST_RECV_READY) ||
(select_ret == TEST_ERROR_READY)) {
@ -305,6 +304,7 @@ int main(int argc, char** argv)
recvLen = wolfSSL_read(ssl, buff, sizeof(buff)-1);
/* Begin do-while read */
readWriteErr = 0;
do {
if (cleanup == 1) {
memset(buff, 0, sizeof(buff));