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

Merge pull request #514 from dgarske/fix_arm_cc_warn

Browse Source 
Fixes for warnings when cross-compiling with GCC ARM.
This commit is contained in:
toddouska
2016-08-05 10:07:32 -07:00
committed by GitHub
parent 67d607324a 2c1309ffc7
commit eeb506b8c0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@@ -12320,7 +12320,7 @@ const char* wolfSSL_get_cipher_name_internal(WOLFSSL* ssl)
const char* fullName; const char* fullName;
const char* first; const char* first;
WOLFSSL_CIPHER* cipher; WOLFSSL_CIPHER* cipher;
word32 i; int i;
if (ssl == NULL) { if (ssl == NULL) {
WOLFSSL_MSG("Bad argument"); WOLFSSL_MSG("Bad argument");
@@ -12335,7 +12335,7 @@ const char* wolfSSL_get_cipher_name_internal(WOLFSSL* ssl)
: (XSTRSTR(fullName, "CCM")) ? "CCM" : (XSTRSTR(fullName, "CCM")) ? "CCM"
: NULL; /* normal */ : NULL; /* normal */
for (i = 0; i < sizeof(cipher_name_idx); i++) { for (i = 0; i < (int)sizeof(cipher_name_idx); i++) {
if (cipher_name_idx[i] == ssl->options.cipherSuite) { if (cipher_name_idx[i] == ssl->options.cipherSuite) {
const char* nameFound = cipher_names[i]; const char* nameFound = cipher_names[i];
@@ -15927,6 +15927,8 @@ int DoSessionTicket(WOLFSSL* ssl,
(void)ssl; (void)ssl;
(void)sigSz; (void)sigSz;
(void)length;
(void)idx;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_async_pop(ssl, WOLF_EVENT_TYPE_ASYNC_ACCEPT); ret = wolfSSL_async_pop(ssl, WOLF_EVENT_TYPE_ASYNC_ACCEPT);

2
wolfcrypt/src/rsa.c
View File

@@ -253,6 +253,8 @@ static int wc_MGF1(enum wc_HashType hType, byte* seed, word32 seedSz,
counter = 0; counter = 0;
idx = 0; idx = 0;
(void)heap;
/* check error return of wc_HashGetDigestSize */ /* check error return of wc_HashGetDigestSize */
if (hLen < 0) { if (hLen < 0) {
return hLen; return hLen;