From 1d27285767aa86b8bd590feb1c05e56866ce0dd9 Mon Sep 17 00:00:00 2001
From: Zhang Jun Hao <zhangjunhao@espressif.com>
Date: Tue, 15 May 2018 11:40:15 +0800
Subject: [PATCH] feat(wolfssl): Redefine wolfssl file folder structure

---
 components/ssl/CMakeLists.txt                                   | 2 +-
 components/ssl/component.mk                                     | 2 +-
 components/ssl/wolfssl/{include => wolfssl}/wolfssl/ssl.h       | 0
 components/ssl/wolfssl/{include => wolfssl}/wolfssl/version.h   | 0
 .../wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/logging.h    | 0
 .../wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/settings.h   | 0
 .../ssl/wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/types.h  | 0
 .../wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/visibility.h | 0
 .../wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/wc_port.h    | 0
 components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfio.h    | 0
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/ssl.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/version.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/logging.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/settings.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/types.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/visibility.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfcrypt/wc_port.h (100%)
 rename components/ssl/wolfssl/{include => wolfssl}/wolfssl/wolfio.h (100%)

diff --git a/components/ssl/CMakeLists.txt b/components/ssl/CMakeLists.txt
index ad73f232..c8fa9bbf 100644
--- a/components/ssl/CMakeLists.txt
+++ b/components/ssl/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 if(CONFIG_SSL_USING_WOLFSSL)
-set(COMPONENT_ADD_INCLUDEDIRS include wolfssl/include)
+set(COMPONENT_ADD_INCLUDEDIRS include wolfssl/include wolfssl/wolfssl)
 else()
 if(CONFIG_SSL_USING_MBEDTLS)
 set(COMPONENT_ADD_INCLUDEDIRS
diff --git a/components/ssl/component.mk b/components/ssl/component.mk
index ed919f26..b385755f 100644
--- a/components/ssl/component.mk
+++ b/components/ssl/component.mk
@@ -3,7 +3,7 @@
 #
 
 ifdef CONFIG_SSL_USING_WOLFSSL
-COMPONENT_ADD_INCLUDEDIRS := wolfssl/include
+COMPONENT_ADD_INCLUDEDIRS := wolfssl/include wolfssl/wolfssl
 
 WOLFSSLLIB = wolfssl
 COMPONENT_ADD_LDFLAGS     := -L $(COMPONENT_PATH)/wolfssl/lib -lwolfssl
diff --git a/components/ssl/wolfssl/include/wolfssl/ssl.h b/components/ssl/wolfssl/wolfssl/wolfssl/ssl.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/ssl.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/ssl.h
diff --git a/components/ssl/wolfssl/include/wolfssl/version.h b/components/ssl/wolfssl/wolfssl/wolfssl/version.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/version.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/version.h
diff --git a/components/ssl/wolfssl/include/wolfssl/wolfcrypt/logging.h b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/logging.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/wolfcrypt/logging.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/logging.h
diff --git a/components/ssl/wolfssl/include/wolfssl/wolfcrypt/settings.h b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/settings.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/wolfcrypt/settings.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/settings.h
diff --git a/components/ssl/wolfssl/include/wolfssl/wolfcrypt/types.h b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/types.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/wolfcrypt/types.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/types.h
diff --git a/components/ssl/wolfssl/include/wolfssl/wolfcrypt/visibility.h b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/visibility.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/wolfcrypt/visibility.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/visibility.h
diff --git a/components/ssl/wolfssl/include/wolfssl/wolfcrypt/wc_port.h b/components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/wc_port.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/wolfcrypt/wc_port.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/wolfcrypt/wc_port.h
diff --git a/components/ssl/wolfssl/include/wolfssl/wolfio.h b/components/ssl/wolfssl/wolfssl/wolfssl/wolfio.h
similarity index 100%
rename from components/ssl/wolfssl/include/wolfssl/wolfio.h
rename to components/ssl/wolfssl/wolfssl/wolfssl/wolfio.h