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

2nd round scan build

Browse Source
This commit is contained in:
toddouska
2013-02-14 16:00:45 -08:00
parent cdc651a75a
commit 9ea3371079
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ctaocrypt/benchmark/benchmark.c
View File

@@ -649,6 +649,7 @@ void bench_rsa(void)
} }
bytes = fread(tmp, 1, sizeof(tmp), file); bytes = fread(tmp, 1, sizeof(tmp), file);
fclose(file);
#endif /* USE_CERT_BUFFERS */ #endif /* USE_CERT_BUFFERS */
#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
@@ -694,9 +695,6 @@ void bench_rsa(void)
printf("RSA %d decryption took %6.2f milliseconds, avg over %d" printf("RSA %d decryption took %6.2f milliseconds, avg over %d"
" iterations\n", rsaKeySz, milliEach, times); " iterations\n", rsaKeySz, milliEach, times);
#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048)
fclose(file);
#endif
FreeRsaKey(&rsaKey); FreeRsaKey(&rsaKey);
#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
RsaFreeCavium(&rsaKey); RsaFreeCavium(&rsaKey);

2
ctaocrypt/src/hmac.c
View File

@@ -154,7 +154,7 @@ void HmacSetKey(Hmac* hmac, int type, const byte* key, word32 length)
default: default:
break; break;
} }
if ( (hmac_block_size - length) > 0) if (length < hmac_block_size)
XMEMSET(ip + length, 0, hmac_block_size - length); XMEMSET(ip + length, 0, hmac_block_size - length);
for(i = 0; i < hmac_block_size; i++) { for(i = 0; i < hmac_block_size; i++) {

2
cyassl/internal.h
View File

@@ -549,6 +549,8 @@ enum Misc {
MAX_PSK_ID_LEN = 128, /* max psk identity/hint supported */ MAX_PSK_ID_LEN = 128, /* max psk identity/hint supported */
MAX_PSK_KEY_LEN = 64, /* max psk key supported */ MAX_PSK_KEY_LEN = 64, /* max psk key supported */
MAX_CYASSL_FILE_SIZE = 1024 * 1024 * 4, /* 4 mb file size alloc limit */
#ifdef FORTRESS #ifdef FORTRESS
MAX_EX_DATA = 3, /* allow for three items of ex_data */ MAX_EX_DATA = 3, /* allow for three items of ex_data */
#endif #endif

4
cyassl/test.h
View File

@@ -421,7 +421,7 @@ static INLINE int tcp_select(SOCKET_T socketfd, int to_sec)
{ {
fd_set recvfds, errfds; fd_set recvfds, errfds;
SOCKET_T nfds = socketfd + 1; SOCKET_T nfds = socketfd + 1;
struct timeval timeout = {to_sec, 0}; struct timeval timeout = { (to_sec > 0) ? to_sec : 0, 0};
int result; int result;
FD_ZERO(&recvfds); FD_ZERO(&recvfds);
@@ -570,7 +570,7 @@ static INLINE void tcp_set_nonblocking(SOCKET_T* sockfd)
int flags = fcntl(*sockfd, F_GETFL, 0); int flags = fcntl(*sockfd, F_GETFL, 0);
if (flags < 0) if (flags < 0)
err_sys("fcntl get failed"); err_sys("fcntl get failed");
fcntl(*sockfd, F_SETFL, flags | O_NONBLOCK); flags = fcntl(*sockfd, F_SETFL, flags | O_NONBLOCK);
if (flags < 0) if (flags < 0)
err_sys("fcntl set failed"); err_sys("fcntl set failed");
#endif #endif

6
src/ssl.c
View File

@@ -1739,6 +1739,12 @@ int CyaSSL_CertManagerVerify(CYASSL_CERT_MANAGER* cm, const char* fname,
sz = XFTELL(file); sz = XFTELL(file);
XREWIND(file); XREWIND(file);
if (sz > MAX_CYASSL_FILE_SIZE) {
CYASSL_MSG("CertManagerVerify file too big");
XFCLOSE(file);
return SSL_BAD_FILE;
}
if (sz > (long)sizeof(staticBuffer)) { if (sz > (long)sizeof(staticBuffer)) {
CYASSL_MSG("Getting dynamic buffer"); CYASSL_MSG("Getting dynamic buffer");
myBuffer = (byte*) XMALLOC(sz, cm->heap, DYNAMIC_TYPE_FILE); myBuffer = (byte*) XMALLOC(sz, cm->heap, DYNAMIC_TYPE_FILE);