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

Merge pull request #1029 from kaleb-himes/RIOT_OS_PORTABILITY

Browse Source 
Riot os portability and minor design modifications
This commit is contained in:
dgarske
2017-07-17 05:16:56 -07:00
committed by GitHub
parent f7cd8a0f15 a7390e32ec
commit cc4ca6a44a
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/wc_port.c
View File

@ -329,7 +329,7 @@ void wc_ReadDirClose(ReadDirCtx* ctx)
#endif /* !NO_FILESYSTEM && !NO_WOLFSSL_DIR */ #endif /* !NO_FILESYSTEM && !NO_WOLFSSL_DIR */
wolfSSL_Mutex* wc_InitAndAllocMutex() wolfSSL_Mutex* wc_InitAndAllocMutex(void)
{ {
wolfSSL_Mutex* m = (wolfSSL_Mutex*) XMALLOC(sizeof(wolfSSL_Mutex), NULL, wolfSSL_Mutex* m = (wolfSSL_Mutex*) XMALLOC(sizeof(wolfSSL_Mutex), NULL,
DYNAMIC_TYPE_MUTEX); DYNAMIC_TYPE_MUTEX);

18
wolfcrypt/test/test.c
View File

@ -908,7 +908,7 @@ int wolfcrypt_test(void* args)
#endif /* NO_MAIN_DRIVER */ #endif /* NO_MAIN_DRIVER */
int error_test() int error_test(void)
{ {
const char* errStr; const char* errStr;
char out[WOLFSSL_MAX_ERROR_SZ]; char out[WOLFSSL_MAX_ERROR_SZ];
@ -971,7 +971,7 @@ int error_test()
} }
#if !defined(NO_CODING) && defined(WOLFSSL_BASE64_ENCODE) #if !defined(NO_CODING) && defined(WOLFSSL_BASE64_ENCODE)
int base64_test() int base64_test(void)
{ {
int ret; int ret;
const byte good[] = "A+Gd\0\0\0"; const byte good[] = "A+Gd\0\0\0";
@ -1068,7 +1068,7 @@ int base64_test()
#endif #endif
#ifndef NO_ASN #ifndef NO_ASN
int asn_test() int asn_test(void)
{ {
#ifndef NO_ASN_TIME #ifndef NO_ASN_TIME
#ifdef WORD64_AVAILABLE #ifdef WORD64_AVAILABLE
@ -1098,7 +1098,7 @@ int asn_test()
#endif #endif
#ifdef WOLFSSL_MD2 #ifdef WOLFSSL_MD2
int md2_test() int md2_test(void)
{ {
Md2 md2; Md2 md2;
byte hash[MD2_DIGEST_SIZE]; byte hash[MD2_DIGEST_SIZE];
@ -11234,7 +11234,7 @@ done:
#endif /* HAVE_ECC_ENCRYPT */ #endif /* HAVE_ECC_ENCRYPT */
#ifdef USE_CERT_BUFFERS_256 #ifdef USE_CERT_BUFFERS_256
int ecc_test_buffers() { int ecc_test_buffers(void) {
size_t bytes; size_t bytes;
ecc_key cliKey; ecc_key cliKey;
ecc_key servKey; ecc_key servKey;
@ -13432,7 +13432,7 @@ static int randNum(mp_int* n, int len, WC_RNG* rng, void* heap)
} }
#endif #endif
int mp_test() int mp_test(void)
{ {
WC_RNG rng; WC_RNG rng;
int ret; int ret;
@ -13577,7 +13577,7 @@ static void my_Logging_cb(const int logLevel, const char *const logMessage)
} }
#endif #endif
int logging_test() int logging_test(void)
{ {
#ifdef DEBUG_WOLFSSL #ifdef DEBUG_WOLFSSL
const char* msg = "Testing, testing. 1, 2, 3, 4 ..."; const char* msg = "Testing, testing. 1, 2, 3, 4 ...";
@ -13633,7 +13633,7 @@ int logging_test()
} }
#endif #endif
int mutex_test() int mutex_test(void)
{ {
#ifdef WOLFSSL_PTHREADS #ifdef WOLFSSL_PTHREADS
wolfSSL_Mutex m; wolfSSL_Mutex m;
@ -13685,7 +13685,7 @@ static void *my_Realloc_cb(void *ptr, size_t size)
return realloc(ptr, size); return realloc(ptr, size);
} }
int memcb_test() int memcb_test(void)
{ {
int ret = 0; int ret = 0;
byte* b = NULL; byte* b = NULL;

3
wolfssl/wolfcrypt/settings.h
View File

@ -415,9 +415,8 @@
#define NO_WRITEV #define NO_WRITEV
#define TFM_NO_ASM #define TFM_NO_ASM
#define USE_FAST_MATH #define USE_FAST_MATH
#define NO_FILE_SYSTEM #define NO_FILESYSTEM
#define USE_CERT_BUFFERS_2048 #define USE_CERT_BUFFERS_2048
#define HAVE_ECC
#endif #endif
#ifdef WOLFSSL_NRF5x #ifdef WOLFSSL_NRF5x