cleanup

src/ssl.c

@@ -32,7 +32,6 @@
     #include <errno.h>
 #endif
 
-#include <wolfssl/ssl.h>
 #include <wolfssl/internal.h>
 #include <wolfssl/error-ssl.h>
 #include <wolfssl/wolfcrypt/coding.h>

src/tls.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *
- * This file is part of wolfSSL.
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
  * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-  /* Name change compatibility layer */
-#include <cyassl/ssl.h>
 
 #ifdef HAVE_CONFIG_H
     #include <config.h>
@@ -28,7 +26,7 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
-#include <wolfssl/ssl.h>
+#include <cyassl/ssl.h>
 #include <wolfssl/internal.h>
 #include <wolfssl/error-ssl.h>
 #include <wolfssl/wolfcrypt/hmac.h>

tests/api.c

@@ -34,7 +34,7 @@
 #include <cyassl/error-ssl.h>
 
 #include <stdlib.h>
-#include <cyassl/ssl.h>
+#include <cyassl/ssl.h>  /* compatibility layer */
 #include <cyassl/test.h>
 #include <tests/unit.h>
 

wolfssl/openssl/ssl.h

@@ -31,9 +31,6 @@
 /* wolfssl_cyassl compatibility layer */
 #include <cyassl/ssl.h>
 
- /* wolfssl ssl.h */
-#include <wolfssl/ssl.h>
-
 #ifdef __cplusplus
     extern "C" {
 #endif

wolfssl/test.h

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