remove more stale cyassl headers

examples/client/client.c

@@ -122,8 +122,8 @@ static void Usage(void)
     printf("client "    LIBWOLFSSL_VERSION_STRING
            " NOTE: All files relative to wolfSSL home dir\n");
     printf("-?          Help, print this usage\n");
-    printf("-h <host>   Host to connect to, default %s\n", yasslIP);
-    printf("-p <num>    Port to connect on, not 0, default %d\n", yasslPort);
+    printf("-h <host>   Host to connect to, default %s\n", wolfSSLIP);
+    printf("-p <num>    Port to connect on, not 0, default %d\n", wolfSSLPort);
     printf("-v <num>    SSL version [0-3], SSLv3(0) - TLS1.2(3)), default %d\n",
                                  CLIENT_DEFAULT_VERSION);
     printf("-l <str>    Cipher list\n");
@@ -193,9 +193,9 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     int  input;
     int  msgSz = (int)strlen(msg);
 
-    word16 port   = yasslPort;
-    char* host   = (char*)yasslIP;
-    const char* domain = "www.yassl.com";
+    word16 port   = wolfSSLPort;
+    char* host   = (char*)wolfSSLIP;
+    const char* domain = "www.wolfssl.com";
 
     int    ch;
     int    version = CLIENT_INVALID_VERSION;

examples/echoclient/echoclient.c

@@ -25,6 +25,8 @@
 
 #include <cyassl/ctaocrypt/settings.h>
 
+/* let's use cyassl layer AND cyassl openssl layer */
+#include <cyassl/ssl.h>
 #include <cyassl/openssl/ssl.h>
 
 #if defined(CYASSL_MDK_ARM)

examples/echoserver/echoserver.h

@@ -21,4 +21,4 @@
 
 #pragma once
 
-THREAD_RETURN CYASSL_THREAD echoserver_test(void* args);
+THREAD_RETURN WOLFSSL_THREAD echoserver_test(void* args);

examples/server/server.h

@@ -21,4 +21,4 @@
 
 #pragma once
 
-THREAD_RETURN CYASSL_THREAD server_test(void* args);
+THREAD_RETURN WOLFSSL_THREAD server_test(void* args);

tests/api.c

@@ -301,7 +301,7 @@ static THREAD_RETURN WOLFSSL_THREAD test_server_nofail(void* args)
 {
     SOCKET_T sockfd = 0;
     SOCKET_T clientfd = 0;
-    word16 port = yasslPort;
+    word16 port = wolfSSLPort;
 
     WOLFSSL_METHOD* method = 0;
     WOLFSSL_CTX* ctx = 0;
@@ -463,7 +463,7 @@ static void test_client_nofail(void* args)
         goto done2;
     }
 
-    tcp_connect(&sockfd, yasslIP, ((func_args*)args)->signal->port, 0);
+    tcp_connect(&sockfd, wolfSSLIP, ((func_args*)args)->signal->port, 0);
 
     ssl = wolfSSL_new(ctx);
     wolfSSL_set_fd(ssl, sockfd);
@@ -514,7 +514,7 @@ static THREAD_RETURN WOLFSSL_THREAD run_wolfssl_server(void* args)
     WOLFSSL*     ssl = NULL;
     SOCKET_T    sfd = 0;
     SOCKET_T    cfd = 0;
-    word16      port = yasslPort;
+    word16      port = wolfSSLPort;
 
     char msg[] = "I hear you fa shizzle!";
     int  len   = (int) XSTRLEN(msg);

tests/suites.c

@@ -23,12 +23,12 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/settings.h>
+#include <wolfssl/wolfcrypt/settings.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <cyassl/ssl.h>
+#include <wolfssl/ssl.h>
 #include <tests/unit.h>
 
 
@@ -109,7 +109,7 @@ static int IsValidCipherSuite(const char* line, char* suite)
     }
 
     if (found) {
-        if (CyaSSL_CTX_set_cipher_list(cipherSuiteCtx, suite) == SSL_SUCCESS)
+        if (wolfSSL_CTX_set_cipher_list(cipherSuiteCtx, suite) == SSL_SUCCESS)
             valid = 1;
     }
 
@@ -428,7 +428,7 @@ int SuiteTest(void)
 
     (void)test_harness;
 
-    cipherSuiteCtx = CyaSSL_CTX_new(CyaTLSv1_2_client_method());
+    cipherSuiteCtx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
     if (cipherSuiteCtx == NULL) {
         printf("can't get cipher suite ctx\n");
         exit(EXIT_FAILURE);  
@@ -459,8 +459,8 @@ int SuiteTest(void)
 
     printf(" End Cipher Suite Tests\n");
 
-    CyaSSL_CTX_free(cipherSuiteCtx);
-    CyaSSL_Cleanup();
+    wolfSSL_CTX_free(cipherSuiteCtx);
+    wolfSSL_Cleanup();
 
     return args.return_code;
 }

tests/unit.c

@@ -6,7 +6,7 @@
     #include <config.h>
 #endif
 
-#include <cyassl/ctaocrypt/settings.h>
+#include <wolfssl/wolfcrypt/settings.h>
 
 #include <stdio.h>
 #include <tests/unit.h>

tests/unit.h

@@ -3,7 +3,8 @@
 #ifndef CyaSSL_UNIT_H
 #define CyaSSL_UNIT_H
 
-#include <cyassl/test.h>    /* thread and tcp stuff */
+#include <wolfssl/ssl.h>
+#include <wolfssl/test.h>    /* thread and tcp stuff */
 
 #define Fail(description, result) do {                                         \
     printf("\nERROR - %s line %d failed with:", __FILE__, __LINE__);           \

testsuite/testsuite.c

@@ -25,6 +25,7 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
+#include <wolfssl/ssl.h>
 #include <wolfssl/test.h>
 #include "wolfcrypt/test/test.h"
 

wolfssl/test.h

@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
-#include <cyassl/ssl.h> /* portability layer */
 #include <wolfssl/wolfcrypt/types.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
 #include <wolfssl/wolfcrypt/random.h>