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

name changes kaleb push

Browse Source
This commit is contained in:
Kaleb Himes
2014-12-17 10:00:17 -07:00
parent 813ad2e102
commit 53057f0b0d
6 changed files with 1704 additions and 1403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cyassl/ctaocrypt/visibility.h
View File

@@ -43,7 +43,9 @@
#ifdef CYASSL_DLL #ifdef CYASSL_DLL
#define CYASSL_API extern __declspec(dllexport) #define CYASSL_API extern __declspec(dllexport)
#else #else
#define CYASSL_API //#define CYASSL_API
#define WOLFSSL_API
#define CYASSL_API WOLFSSL_API
#endif #endif
#define CYASSL_LOCAL #define CYASSL_LOCAL
#else #else

25
cyassl/openssl/ssl.h
View File

@@ -29,6 +29,7 @@
#define CYASSL_OPENSSL_H_ #define CYASSL_OPENSSL_H_
#include <cyassl/ssl.h> #include <cyassl/ssl.h>
#include <wolfssl/ssl.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -80,20 +81,20 @@ typedef CYASSL_X509_OBJECT X509_OBJECT;
typedef CYASSL_X509_STORE_CTX X509_STORE_CTX; typedef CYASSL_X509_STORE_CTX X509_STORE_CTX;
#define SSLv3_server_method CyaSSLv3_server_method #define SSLv3_server_method wolfSSLv3_server_method
#define SSLv3_client_method CyaSSLv3_client_method #define SSLv3_client_method wolfSSLv3_client_method
#define TLSv1_server_method CyaTLSv1_server_method #define TLSv1_server_method wolfTLSv1_server_method
#define TLSv1_client_method CyaTLSv1_client_method #define TLSv1_client_method wolfTLSv1_client_method
#define TLSv1_1_server_method CyaTLSv1_1_server_method #define TLSv1_1_server_method wolfTLSv1_1_server_method
#define TLSv1_1_client_method CyaTLSv1_1_client_method #define TLSv1_1_client_method wolfTLSv1_1_client_method
#define TLSv1_2_server_method CyaTLSv1_2_server_method #define TLSv1_2_server_method wolfTLSv1_2_server_method
#define TLSv1_2_client_method CyaTLSv1_2_client_method #define TLSv1_2_client_method wolfTLSv1_2_client_method
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
#define DTLSv1_client_method CyaDTLSv1_client_method #define DTLSv1_client_method wolfDTLSv1_client_method
#define DTLSv1_server_method CyaDTLSv1_server_method #define DTLSv1_server_method wolfDTLSv1_server_method
#define DTLSv1_2_client_method CyaDTLSv1_2_client_method #define DTLSv1_2_client_method wolfDTLSv1_2_client_method
#define DTLSv1_2_server_method CyaDTLSv1_2_server_method #define DTLSv1_2_server_method wolfDTLSv1_2_server_method
#endif #endif

1632
cyassl/ssl.h
View File

File diff suppressed because it is too large Load Diff

10
src/ssl.c
View File

@@ -3192,13 +3192,13 @@ static INLINE CYASSL_METHOD* cm_pick_method(void)
#ifdef NO_OLD_TLS #ifdef NO_OLD_TLS
return CyaTLSv1_2_client_method(); return CyaTLSv1_2_client_method();
#else #else
return CyaSSLv3_client_method(); return wolfSSLv3_client_method();
#endif #endif
#elif !defined(NO_CYASSL_SERVER) #elif !defined(NO_CYASSL_SERVER)
#ifdef NO_OLD_TLS #ifdef NO_OLD_TLS
return CyaTLSv1_2_server_method(); return CyaTLSv1_2_server_method();
#else #else
return CyaSSLv3_server_method(); return wolfSSLv3_server_method();
#endif #endif
#else #else
return NULL; return NULL;
@@ -4922,7 +4922,7 @@ int CyaSSL_dtls_got_timeout(CYASSL* ssl)
#ifndef NO_CYASSL_CLIENT #ifndef NO_CYASSL_CLIENT
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
CYASSL_METHOD* CyaSSLv3_client_method(void) CYASSL_METHOD* wolfSSLv3_client_method(void)
{ {
CYASSL_METHOD* method = CYASSL_METHOD* method =
(CYASSL_METHOD*) XMALLOC(sizeof(CYASSL_METHOD), 0, (CYASSL_METHOD*) XMALLOC(sizeof(CYASSL_METHOD), 0,
@@ -5189,7 +5189,7 @@ int CyaSSL_dtls_got_timeout(CYASSL* ssl)
#ifndef NO_CYASSL_SERVER #ifndef NO_CYASSL_SERVER
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
CYASSL_METHOD* CyaSSLv3_server_method(void) CYASSL_METHOD* wolfSSLv3_server_method(void)
{ {
CYASSL_METHOD* method = CYASSL_METHOD* method =
(CYASSL_METHOD*) XMALLOC(sizeof(CYASSL_METHOD), 0, (CYASSL_METHOD*) XMALLOC(sizeof(CYASSL_METHOD), 0,

22
tests/api.c
View File

@@ -101,20 +101,22 @@ static void test_CyaSSL_Method_Allocators(void)
TEST_METHOD_ALLOCATOR(a, AssertNull) TEST_METHOD_ALLOCATOR(a, AssertNull)
#ifndef NO_OLD_TLS #ifndef NO_OLD_TLS
TEST_VALID_METHOD_ALLOCATOR(CyaSSLv3_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfSSLv3_server_method);
TEST_VALID_METHOD_ALLOCATOR(CyaSSLv3_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfSSLv3_client_method);
TEST_VALID_METHOD_ALLOCATOR(CyaTLSv1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_server_method);
TEST_VALID_METHOD_ALLOCATOR(CyaTLSv1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_client_method);
TEST_VALID_METHOD_ALLOCATOR(CyaTLSv1_1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_server_method);
TEST_VALID_METHOD_ALLOCATOR(CyaTLSv1_1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_1_client_method);
#endif #endif
TEST_VALID_METHOD_ALLOCATOR(CyaTLSv1_2_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_2_server_method);
TEST_VALID_METHOD_ALLOCATOR(CyaTLSv1_2_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfTLSv1_2_client_method);
TEST_VALID_METHOD_ALLOCATOR(CyaSSLv23_client_method); TEST_VALID_METHOD_ALLOCATOR(CyaSSLv23_client_method);
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
TEST_VALID_METHOD_ALLOCATOR(CyaDTLSv1_server_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_server_method);
TEST_VALID_METHOD_ALLOCATOR(CyaDTLSv1_client_method); TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_client_method);
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_server_method);
TEST_VALID_METHOD_ALLOCATOR(wolfDTLSv1_2_client_method);
#endif #endif
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA

1414
wolfssl/ssl.h Normal file
View File

File diff suppressed because it is too large Load Diff