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

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek 2012-08-22 15:36:07 -07:00
commit 79c14dc825
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ctaocrypt/src/random.c
View File

@ -146,6 +146,19 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
return 0; return 0;
} }
#elif defined(CYASSL_SAFERTOS)
#warning "write a real random seed!!!!, just for testing now"
int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
{
int i;
for (i = 0; i < sz; i++ )
output[i] = i;
return 0;
}
#elif defined(NO_DEV_RANDOM) #elif defined(NO_DEV_RANDOM)
#error "you need to write an os specific GenerateSeed() here" #error "you need to write an os specific GenerateSeed() here"

9
cyassl/ctaocrypt/settings.h
View File

@ -150,6 +150,8 @@
#endif #endif
#ifdef CYASSL_LSR #ifdef CYASSL_LSR
#define SIZEOF_LONG_LONG 8
#define CYASSL_LOW_MEMORY
#define NO_WRITEV #define NO_WRITEV
#define NO_SHA512 #define NO_SHA512
#define NO_DH #define NO_DH
@ -160,6 +162,7 @@
#define NO_RABBIT #define NO_RABBIT
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#define LSR_FS #define LSR_FS
#include "inc/hw_types.h"
#include "fs.h" #include "fs.h"
#endif #endif
#define CYASSL_LWIP #define CYASSL_LWIP
@ -181,6 +184,12 @@
#define XREALLOC(p, n, h, t) pvPortRealloc((p), (n)) #define XREALLOC(p, n, h, t) pvPortRealloc((p), (n))
#endif #endif
#ifdef CYASSL_LOW_MEMORY
#define RSA_LOW_MEM
#define CYASSL_SMALL_STACK
#define TFM_TIMING_RESISTANT
#endif
#ifdef MICRIUM #ifdef MICRIUM
#include "stdlib.h" #include "stdlib.h"

8
src/ssl.c
View File

@ -1217,11 +1217,11 @@ static int ProcessChainBuffer(CYASSL_CTX* ctx, const unsigned char* buff,
#elif defined(LSR_FS) #elif defined(LSR_FS)
#include <fs.h> #include <fs.h>
#define XFILE struct fs_file* #define XFILE struct fs_file*
#define XFOPEN(NAME, MODE) fs_open(NAME); #define XFOPEN(NAME, MODE) fs_open((char*)NAME);
#define XFSEEK #define XFSEEK(F, O, W) (void)F
#define XFTELL(F) (F)->len #define XFTELL(F) (F)->len
#define XREWIND #define XREWIND(F) (void)F
#define XFREAD(BUF, SZ, AMT, F) fs_read(F, BUF, SZ*AMT) #define XFREAD(BUF, SZ, AMT, F) fs_read(F, (char*)BUF, SZ*AMT)
#define XFCLOSE fs_close #define XFCLOSE fs_close
#define XSEEK_END 0 #define XSEEK_END 0
#define XBADFILE NULL #define XBADFILE NULL