Merge branch 'PIC32MZ' of github.com:kojo1/cyassl-test into kojo1-PIC32MZ

Conflicts:
	ctaocrypt/benchmark/benchmark.c
This commit is contained in:
John Safranek
2014-03-11 09:54:36 -07:00
22 changed files with 1083 additions and 74 deletions

View File

@@ -2256,6 +2256,12 @@ int CyaSSL_CertManagerVerifyBuffer(CYASSL_CERT_MANAGER* cm, const byte* buff,
#ifndef NO_FILESYSTEM
#if defined(CYASSL_MDK_ARM)
extern FILE * CyaSSL_fopen(const char *name, const char *mode) ;
#define XFOPEN CyaSSL_fopen
#else
#define XFOPEN fopen
#endif
/* process a file with name fname into ctx of format and type
userChain specifies a user certificate chain to pass during handshake */