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

tiddy whitespace

Browse Source
This commit is contained in:
toddouska
2015-02-28 11:29:42 -08:00
parent 6f08459264
commit 1caaeb8355
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/random.c
View File

@@ -893,7 +893,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#elif defined(WOLFSSL_SAFERTOS) || defined(WOLFSSL_LEANPSK) \ #elif defined(WOLFSSL_SAFERTOS) || defined(WOLFSSL_LEANPSK) \
|| defined(WOLFSSL_IAR_ARM) || defined(WOLFSSL_MDK_ARM) \ || defined(WOLFSSL_IAR_ARM) || defined(WOLFSSL_MDK_ARM) \
|| defined(WOLFSSL_uITRON4) || defined(WOLFSSL_uTKERNEL2) || defined(WOLFSSL_uITRON4) || defined(WOLFSSL_uTKERNEL2)
#warning "write a real random seed!!!!, just for testing now" #warning "write a real random seed!!!!, just for testing now"
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)

36
wolfcrypt/src/wc_port.c
View File

@@ -396,7 +396,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
m->sem.isemcnt = 1 ; m->sem.isemcnt = 1 ;
m->sem.maxsem = 1 ; m->sem.maxsem = 1 ;
m->sem.name = NULL ; m->sem.name = NULL ;
m->id = acre_sem(&m->sem); m->id = acre_sem(&m->sem);
if( m->id != NULL ) if( m->id != NULL )
iReturn = 0; iReturn = 0;
@@ -427,7 +427,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
/**** uITRON malloc/free ***/ /**** uITRON malloc/free ***/
static ID ID_wolfssl_MPOOL = 0 ; static ID ID_wolfssl_MPOOL = 0 ;
static T_CMPL wolfssl_MPOOL = {TA_TFIFO, 0, NULL, "wolfSSL_MPOOL"}; static T_CMPL wolfssl_MPOOL = {TA_TFIFO, 0, NULL, "wolfSSL_MPOOL"};
int uITRON4_minit(size_t poolsz) { int uITRON4_minit(size_t poolsz) {
ER ercd; ER ercd;
wolfssl_MPOOL.mplsz = poolsz ; wolfssl_MPOOL.mplsz = poolsz ;
@@ -439,7 +439,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
return -1; return -1;
} }
} }
void *uITRON4_malloc(size_t sz) { void *uITRON4_malloc(size_t sz) {
ER ercd; ER ercd;
void *p ; void *p ;
@@ -448,9 +448,9 @@ int UnLockMutex(wolfSSL_Mutex *m)
return p; return p;
} else { } else {
return 0 ; return 0 ;
} }
} }
void *uITRON4_realloc(void *p, size_t sz) { void *uITRON4_realloc(void *p, size_t sz) {
ER ercd; ER ercd;
void *newp ; void *newp ;
@@ -459,14 +459,14 @@ int UnLockMutex(wolfSSL_Mutex *m)
if (ercd == E_OK) { if (ercd == E_OK) {
memcpy(newp, p, sz) ; memcpy(newp, p, sz) ;
ercd = rel_mpl(ID_wolfssl_MPOOL, (VP)p); ercd = rel_mpl(ID_wolfssl_MPOOL, (VP)p);
if (ercd == E_OK) { if (ercd == E_OK) {
return newp; return newp;
} }
} }
} }
return 0 ; return 0 ;
} }
void uITRON4_free(void *p) { void uITRON4_free(void *p) {
ER ercd; ER ercd;
ercd = rel_mpl(ID_wolfssl_MPOOL, (VP)p); ercd = rel_mpl(ID_wolfssl_MPOOL, (VP)p);
@@ -474,7 +474,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
return ; return ;
} else { } else {
return ; return ;
} }
} }
#elif defined(WOLFSSL_uTKERNEL2) #elif defined(WOLFSSL_uTKERNEL2)
@@ -485,7 +485,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
m->sem.sematr = TA_TFIFO ; m->sem.sematr = TA_TFIFO ;
m->sem.isemcnt = 1 ; m->sem.isemcnt = 1 ;
m->sem.maxsem = 1 ; m->sem.maxsem = 1 ;
m->id = tk_cre_sem(&m->sem); m->id = tk_cre_sem(&m->sem);
if( m->id != NULL ) if( m->id != NULL )
iReturn = 0; iReturn = 0;
@@ -516,9 +516,9 @@ int UnLockMutex(wolfSSL_Mutex *m)
/**** uT-Kernel malloc/free ***/ /**** uT-Kernel malloc/free ***/
static ID ID_wolfssl_MPOOL = 0 ; static ID ID_wolfssl_MPOOL = 0 ;
static T_CMPL wolfssl_MPOOL = static T_CMPL wolfssl_MPOOL =
{(void *)NULL, {(void *)NULL,
TA_TFIFO , 0, "wolfSSL_MPOOL"}; TA_TFIFO , 0, "wolfSSL_MPOOL"};
int uTKernel_init_mpool(unsigned int sz) { int uTKernel_init_mpool(unsigned int sz) {
ER ercd; ER ercd;
wolfssl_MPOOL.mplsz = sz ; wolfssl_MPOOL.mplsz = sz ;
@@ -530,7 +530,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
return -1; return -1;
} }
} }
void *uTKernel_malloc(unsigned int sz) { void *uTKernel_malloc(unsigned int sz) {
ER ercd; ER ercd;
void *p ; void *p ;
@@ -539,9 +539,9 @@ int UnLockMutex(wolfSSL_Mutex *m)
return p; return p;
} else { } else {
return 0 ; return 0 ;
} }
} }
void *uTKernel_realloc(void *p, unsigned int sz) { void *uTKernel_realloc(void *p, unsigned int sz) {
ER ercd; ER ercd;
void *newp ; void *newp ;
@@ -550,14 +550,14 @@ int UnLockMutex(wolfSSL_Mutex *m)
if (ercd == E_OK) { if (ercd == E_OK) {
memcpy(newp, p, sz) ; memcpy(newp, p, sz) ;
ercd = tk_rel_mpl(ID_wolfssl_MPOOL, (VP)p); ercd = tk_rel_mpl(ID_wolfssl_MPOOL, (VP)p);
if (ercd == E_OK) { if (ercd == E_OK) {
return newp; return newp;
} }
} }
} }
return 0 ; return 0 ;
} }
void uTKernel_free(void *p) { void uTKernel_free(void *p) {
ER ercd; ER ercd;
ercd = tk_rel_mpl(ID_wolfssl_MPOOL, (VP)p); ercd = tk_rel_mpl(ID_wolfssl_MPOOL, (VP)p);
@@ -565,7 +565,7 @@ int UnLockMutex(wolfSSL_Mutex *m)
return ; return ;
} else { } else {
return ; return ;
} }
} }
#elif defined(WOLFSSL_MDK_ARM)|| defined(WOLFSSL_CMSIS_RTOS) #elif defined(WOLFSSL_MDK_ARM)|| defined(WOLFSSL_CMSIS_RTOS)

4
wolfssl/wolfcrypt/settings.h
View File

@@ -101,7 +101,7 @@
/* Uncomment next line if building for uITRON4 */ /* Uncomment next line if building for uITRON4 */
/* #define WOLFSSL_uITRON4 */ /* #define WOLFSSL_uITRON4 */
/* Uncomment next line if building for uT-Kernel */ /* Uncomment next line if building for uT-Kernel */
/* #define WOLFSSL_uTKERNEL2 */ /* #define WOLFSSL_uTKERNEL2 */
@@ -650,7 +650,7 @@
#endif #endif
#endif /* MICRIUM */ #endif /* MICRIUM */
#ifdef WOLFSSL_QL #ifdef WOLFSSL_QL
#ifndef WOLFSSL_SEP #ifndef WOLFSSL_SEP