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

legacy defines and updates

Browse Source
This commit is contained in:
kaleb-himes
2015-01-13 13:27:01 -07:00
parent 7f3184b0ed
commit 288d9a039d
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cyassl/ssl.h
View File

@@ -55,6 +55,10 @@
/* redeclare guard */ /* redeclare guard */
#define CYASSL_TYPES_DEFINED WOLFSSL_TYPES_DEFINED #define CYASSL_TYPES_DEFINED WOLFSSL_TYPES_DEFINED
/* legacy defines */
#define yasslIP wolfSSLIP /**/
#define yasslPort wolfSSLPort /**/
/* cyassl/ssl.h (structs) */ /* cyassl/ssl.h (structs) */
#define CYASSL_RSA WOLFSSL_RSA #define CYASSL_RSA WOLFSSL_RSA
#define CYASSL_DSA WOLFSSL_DSA #define CYASSL_DSA WOLFSSL_DSA

2
testsuite/testsuite.c
View File

@@ -118,7 +118,7 @@ int testsuite_test(int argc, char** argv)
simple_test(&server_args); simple_test(&server_args);
if (server_args.return_code != 0) return server_args.return_code; if (server_args.return_code != 0) return server_args.return_code;
/* Echo input yaSSL client server test */ /* Echo input wolfSSL client server test */
start_thread(echoserver_test, &server_args, &serverThread); start_thread(echoserver_test, &server_args, &serverThread);
wait_tcp_ready(&server_args); wait_tcp_ready(&server_args);
{ {

16
wolfssl/test.h
View File

@@ -210,17 +210,17 @@ typedef THREAD_RETURN WOLFSSL_THREAD THREAD_FUNC(void*);
void start_thread(THREAD_FUNC, func_args*, THREAD_TYPE*); void start_thread(THREAD_FUNC, func_args*, THREAD_TYPE*);
void join_thread(THREAD_TYPE); void join_thread(THREAD_TYPE);
/* yaSSL */ /* wolfSSL */
#ifndef TEST_IPV6 #ifndef TEST_IPV6
static const char* const yasslIP = "127.0.0.1"; static const char* const wolfSSLIP = "127.0.0.1";
#else #else
static const char* const yasslIP = "::1"; static const char* const wolfSSLIP = "::1";
#endif #endif
static const word16 yasslPort = 11111; static const word16 wolfSSLPort = 11111;
static INLINE void err_sys(const char* msg) static INLINE void err_sys(const char* msg)
{ {
printf("yassl error: %s\n", msg); printf("wolfSSL error: %s\n", msg);
if (msg) if (msg)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -301,7 +301,7 @@ static INLINE int PasswordCallBack(char* passwd, int sz, int rw, void* userdata)
{ {
(void)rw; (void)rw;
(void)userdata; (void)userdata;
strncpy(passwd, "yassl123", sz); strncpy(passwd, "wolfSSL123", sz);
return 8; return 8;
} }
@@ -586,7 +586,7 @@ static INLINE void tcp_listen(SOCKET_T* sockfd, word16* port, int useAnyAddr,
/* don't use INADDR_ANY by default, firewall may block, make user switch /* don't use INADDR_ANY by default, firewall may block, make user switch
on */ on */
build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), *port, udp); build_addr(&addr, (useAnyAddr ? INADDR_ANY : wolfSSLIP), *port, udp);
tcp_socket(sockfd, udp); tcp_socket(sockfd, udp);
#if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_MDK_ARM) #if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_MDK_ARM)
@@ -646,7 +646,7 @@ static INLINE void udp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
SOCKADDR_IN_T addr; SOCKADDR_IN_T addr;
(void)args; (void)args;
build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), port, 1); build_addr(&addr, (useAnyAddr ? INADDR_ANY : wolfSSLIP), port, 1);
tcp_socket(sockfd, 1); tcp_socket(sockfd, 1);