From 288d9a039d6ed0d0707dc629c4a8451e7b8619d8 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Tue, 13 Jan 2015 13:27:01 -0700
Subject: [PATCH] legacy defines and updates

---
 cyassl/ssl.h          |  4 ++++
 testsuite/testsuite.c |  2 +-
 wolfssl/test.h        | 16 ++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/cyassl/ssl.h b/cyassl/ssl.h
index e1c9b1952..8107b585f 100644
--- a/cyassl/ssl.h
+++ b/cyassl/ssl.h
@@ -55,6 +55,10 @@
 /* redeclare guard */
 #define CYASSL_TYPES_DEFINED WOLFSSL_TYPES_DEFINED
 
+/* legacy defines */
+#define yasslIP          wolfSSLIP /**/
+#define yasslPort        wolfSSLPort /**/
+
 /* cyassl/ssl.h (structs) */
 #define CYASSL_RSA                WOLFSSL_RSA
 #define CYASSL_DSA                WOLFSSL_DSA
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 2a7fad7cd..1e426fbb3 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -118,7 +118,7 @@ int testsuite_test(int argc, char** argv)
     simple_test(&server_args);
     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);
     wait_tcp_ready(&server_args);
     {
diff --git a/wolfssl/test.h b/wolfssl/test.h
index d05aa7b5d..11989cd4b 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -210,17 +210,17 @@ typedef THREAD_RETURN WOLFSSL_THREAD THREAD_FUNC(void*);
 void start_thread(THREAD_FUNC, func_args*, THREAD_TYPE*);
 void join_thread(THREAD_TYPE);
 
-/* yaSSL */
+/* wolfSSL */
 #ifndef TEST_IPV6
-    static const char* const yasslIP   = "127.0.0.1";
+    static const char* const wolfSSLIP   = "127.0.0.1";
 #else
-    static const char* const yasslIP   = "::1";
+    static const char* const wolfSSLIP   = "::1";
 #endif
-static const word16      yasslPort = 11111;
+static const word16      wolfSSLPort = 11111;
 
 static INLINE void err_sys(const char* msg)
 {
-    printf("yassl error: %s\n", msg);
+    printf("wolfSSL error: %s\n", msg);
     if (msg)
         exit(EXIT_FAILURE);
 }
@@ -301,7 +301,7 @@ static INLINE int PasswordCallBack(char* passwd, int sz, int rw, void* userdata)
 {
     (void)rw;
     (void)userdata;
-    strncpy(passwd, "yassl123", sz);
+    strncpy(passwd, "wolfSSL123", sz);
     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
        on */
-    build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), *port, udp);
+    build_addr(&addr, (useAnyAddr ? INADDR_ANY : wolfSSLIP), *port, udp);
     tcp_socket(sockfd, udp);
 
 #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;
 
     (void)args;
-    build_addr(&addr, (useAnyAddr ? INADDR_ANY : yasslIP), port, 1);
+    build_addr(&addr, (useAnyAddr ? INADDR_ANY : wolfSSLIP), port, 1);
     tcp_socket(sockfd, 1);