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-11-01 16:52:26 -07:00
commit 917bc83c60
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ctaocrypt/test/test.c
View File

@ -23,10 +23,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef CYASSL_TEST_CERT #ifdef CYASSL_TEST_CERT
#include <cyassl/ctaocrypt/asn.h> #include <cyassl/ctaocrypt/asn.h>
#else #else
@ -71,6 +67,15 @@
#include "crypto_ntru.h" #include "crypto_ntru.h"
#endif #endif
#include <string.h>
#ifdef FREESCALE_MQX
#include <mqx.h>
#include <fio.h>
#else
#include <stdio.h>
#endif
#include <stdlib.h>
#ifdef THREADX #ifdef THREADX
/* since just testing, use THREADX log printf instead */ /* since just testing, use THREADX log printf instead */
@ -1398,11 +1403,20 @@ byte GetEntropy(ENTROPY_CMD cmd, byte* out)
#ifndef NO_RSA #ifndef NO_RSA
static const char* clientKey = "./certs/client-key.der"; #ifdef FREESCALE_MQX
static const char* clientCert = "./certs/client-cert.der"; static const char* clientKey = "a:\certs\\client-key.der";
#ifdef CYASSL_CERT_GEN static const char* clientCert = "a:\certs\\client-cert.der";
static const char* caKeyFile = "./certs/ca-key.der"; #ifdef CYASSL_CERT_GEN
static const char* caCertFile = "./certs/ca-cert.pem"; static const char* caKeyFile = "a:\certs\\ca-key.der";
static const char* caCertFile = "a:\certs\\ca-cert.pem";
#endif
#else
static const char* clientKey = "./certs/client-key.der";
static const char* clientCert = "./certs/client-cert.der";
#ifdef CYASSL_CERT_GEN
static const char* caKeyFile = "./certs/ca-key.der";
static const char* caCertFile = "./certs/ca-cert.pem";
#endif
#endif #endif
#define FOURK_BUF 4096 #define FOURK_BUF 4096
@ -1813,7 +1827,11 @@ int rsa_test(void)
#ifndef NO_DH #ifndef NO_DH
static const char* dhKey = "./certs/dh2048.der"; #ifdef FREESCALE_MQX
static const char* dhKey = "a:\certs\\dh2048.der";
#else
static const char* dhKey = "./certs/dh2048.der";
#endif
int dh_test(void) int dh_test(void)
{ {
@ -1877,7 +1895,11 @@ int dh_test(void)
#ifndef NO_DSA #ifndef NO_DSA
static const char* dsaKey = "./certs/dsa2048.der"; #ifdef FREESCALE_MQX
static const char* dsaKey = "a:\certs\\dsa2048.der";
#else
static const char* dsaKey = "./certs/dsa2048.der";
#endif
int dsa_test(void) int dsa_test(void)
{ {