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

fastmath, maxfragment, md5, iopool, certreq, certgen

Browse Source
This commit is contained in:
kaleb-himes
2015-01-05 09:53:00 -07:00
parent accfaf17af
commit 4ba12c86cb
5 changed files with 133 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cyassl/ssl.h
View File

@@ -58,6 +58,8 @@
#define CYASSL_BIO WOLFSSL_BIO #define CYASSL_BIO WOLFSSL_BIO
#define CYASSL_CIPHER WOLFSSL_CIPHER #define CYASSL_CIPHER WOLFSSL_CIPHER
#define CYASSL_MD4_CTX WOLFSSL_MD4_CTX #define CYASSL_MD4_CTX WOLFSSL_MD4_CTX
#define CYASSL_MFL_2_9 WOLFSSL_MFL_2_9
#define CYASSL_MFL_2_13 WOLFSSL_MFL_2_13
#define CYASSL_EVP_PKEY WOLFSSL_EVP_PKEY #define CYASSL_EVP_PKEY WOLFSSL_EVP_PKEY
#define CYASSL_X509_CRL WOLFSSL_X509_CRL #define CYASSL_X509_CRL WOLFSSL_X509_CRL
#define CYASSL_ASN1_TIME WOLFSSL_ASN1_TIME #define CYASSL_ASN1_TIME WOLFSSL_ASN1_TIME

2
src/ssl.c
View File

@@ -5513,7 +5513,7 @@ static INLINE word32 HashSession(const byte* sessionID, word32 len, int* error)
#ifndef NO_MD5 #ifndef NO_MD5
*error = wc_Md5Hash(sessionID, len, digest); *error = wc_Md5Hash(sessionID, len, digest);
#elif !defined(NO_SHA) #elif !defined(NO_SHA)
*error = ShaHash(sessionID, len, digest); *error = wc_ShaHash(sessionID, len, digest);
#elif !defined(NO_SHA256) #elif !defined(NO_SHA256)
*error = Sha256Hash(sessionID, len, digest); *error = Sha256Hash(sessionID, len, digest);
#else #else

8
wolfcrypt/src/memory.c
View File

@@ -130,7 +130,7 @@ static THREAD_LS_T byte pool_in[17*1024];
static THREAD_LS_T byte pool_out[17*1024]; static THREAD_LS_T byte pool_out[17*1024];
void* wc_MALLOC(size_t n, void* heap, int type) void* XMALLOC(size_t n, void* heap, int type)
{ {
(void)heap; (void)heap;
@@ -151,7 +151,7 @@ void* wc_MALLOC(size_t n, void* heap, int type)
return malloc(n); return malloc(n);
} }
void* wc_REALLOC(void *p, size_t n, void* heap, int type) void* XREALLOC(void *p, size_t n, void* heap, int type)
{ {
(void)heap; (void)heap;
@@ -173,8 +173,8 @@ void* wc_REALLOC(void *p, size_t n, void* heap, int type)
} }
/* unit api calls, let's make sure visisble with CYASSL_API */ /* unit api calls, let's make sure visible with CYASSL_API */
WOLFSSL_API void wc_FREE(void *p, void* heap, int type) WOLFSSL_API void XFREE(void *p, void* heap, int type)
{ {
(void)heap; (void)heap;