mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build warnings with lean-psk mode

Browse Source
This commit is contained in:
John Safranek 2014-07-16 14:40:41 -07:00
parent 99f6fd8450
commit 307e5f3bff
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctaocrypt/benchmark/benchmark.c
View File

@ -259,6 +259,17 @@ enum BenchmarkBounds {
static const char blockType[] = "megs"; /* used in printf output */ static const char blockType[] = "megs"; /* used in printf output */
#endif #endif
/* use kB instead of mB for embedded benchmarking */
#ifdef BENCH_EMBEDDED
static byte plain [1024];
#else
static byte plain [1024*1024];
#endif
#ifndef NO_AES
static const byte key[] = static const byte key[] =
{ {
0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef, 0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
@ -277,15 +288,12 @@ static const byte iv[] =
/* use kB instead of mB for embedded benchmarking */ /* use kB instead of mB for embedded benchmarking */
#ifdef BENCH_EMBEDDED #ifdef BENCH_EMBEDDED
static byte plain [1024];
static byte cipher[1024]; static byte cipher[1024];
#else #else
static byte plain [1024*1024];
static byte cipher[1024*1024]; static byte cipher[1024*1024];
#endif #endif
#ifndef NO_AES
void bench_aes(int show) void bench_aes(int show)
{ {
Aes enc; Aes enc;

4
src/internal.c
View File

@ -203,6 +203,7 @@ static INLINE void c16toa(word16 u16, byte* c)
} }
#if !defined(NO_OLD_TLS) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)
/* convert 32 bit integer to opaque */ /* convert 32 bit integer to opaque */
static INLINE void c32toa(word32 u32, byte* c) static INLINE void c32toa(word32 u32, byte* c)
{ {
@ -211,6 +212,7 @@ static INLINE void c32toa(word32 u32, byte* c)
c[2] = (u32 >> 8) & 0xff; c[2] = (u32 >> 8) & 0xff;
c[3] = u32 & 0xff; c[3] = u32 & 0xff;
} }
#endif
/* convert a 24 bit integer into a 32 bit one */ /* convert a 24 bit integer into a 32 bit one */
@ -4669,6 +4671,7 @@ static int DoDtlsHandShakeMsg(CYASSL* ssl, byte* input, word32* inOutIdx,
#endif #endif
#if !defined(NO_OLD_TLS) || defined(HAVE_AESCCM) || defined(HAVE_AESGCM)
static INLINE word32 GetSEQIncrement(CYASSL* ssl, int verify) static INLINE word32 GetSEQIncrement(CYASSL* ssl, int verify)
{ {
if (verify) if (verify)
@ -4676,6 +4679,7 @@ static INLINE word32 GetSEQIncrement(CYASSL* ssl, int verify)
else else
return ssl->keys.sequence_number++; return ssl->keys.sequence_number++;
} }
#endif
#ifdef HAVE_AEAD #ifdef HAVE_AEAD